Commit 9bf445b6 authored Oct 04, 2022 by Linus Torvalds

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

parents 901735e5 f92ff8f5

arch/x86/include/asm/paravirt.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,7 @@ extern void default_banner(void);
		word 771b; \
		.byte ptype; \
		.byte 772b-771b; \
		_ASM_ALIGN; \
		.popsection

arch/x86/include/asm/paravirt_types.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,7 @@ extern struct paravirt_patch_template pv_ops;
		" .byte " type "\n" \
		" .byte 772b-771b\n" \
		" .short " clobber "\n" \
		_ASM_ALIGN "\n" \
		".popsection\n"

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