Commit b7a5eb6a authored Sep 05, 2018 by Juergen Gross Committed by Thomas Gleixner Sep 06, 2018

x86/paravirt: Prevent redefinition of SAVE_FLAGS macro



The PARAVIRT_XXL changes introduced a redefinition of SAVE_FLAGS under
certain configurations. Cure it

Fixes: 6da63eb2 ("x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella").
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/20180905053720.13710-1-jgross@suse.com

parent 4f2d7af7

arch/x86/include/asm/paravirt.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -914,7 +914,6 @@ extern void default_banner(void);
		PARA_SITE(PARA_PATCH(PV_CPU_usergs_sysret64), \
		ANNOTATE_RETPOLINE_SAFE; \
		jmp PARA_INDIRECT(pv_ops+PV_CPU_usergs_sysret64);)
		#endif

		#ifdef CONFIG_DEBUG_ENTRY
		#define SAVE_FLAGS(clobbers) \
		@@ -924,6 +923,7 @@ extern void default_banner(void);
		call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); \
		PV_RESTORE_REGS(clobbers \| CLBR_CALLEE_SAVE);)
		#endif
		#endif

		#endif /* CONFIG_X86_32 */

Admin message