Skip to content

Commit 9bf445b

Browse files
committed
Merge tag 'x86_paravirt_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 paravirt fix from Borislav Petkov: - Ensure paravirt patching site descriptors are aligned properly so that code can do proper arithmetic with their addresses * tag 'x86_paravirt_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/paravirt: Ensure proper alignment
2 parents 901735e + f92ff8f commit 9bf445b

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/x86/include/asm/paravirt.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@ extern void default_banner(void);
743743
word 771b; \
744744
.byte ptype; \
745745
.byte 772b-771b; \
746+
_ASM_ALIGN; \
746747
.popsection
747748

748749

arch/x86/include/asm/paravirt_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ extern struct paravirt_patch_template pv_ops;
294294
" .byte " type "\n" \
295295
" .byte 772b-771b\n" \
296296
" .short " clobber "\n" \
297+
_ASM_ALIGN "\n" \
297298
".popsection\n"
298299

299300
/* Generate patchable code, with the default asm parameters. */

0 commit comments

Comments
 (0)