summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2018-09-05 01:37:20 -0400
committerThomas Gleixner <tglx@linutronix.de>2018-09-06 08:37:37 -0400
commitb7a5eb6aafa95fce45fc4dcbc195cb232fa1b76d (patch)
treeab644249170a1d46d64698b12f17fa69abc27dc5
parent4f2d7af70256b258a6a5729a1d33d5ecb2330f8f (diff)
x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
The PARAVIRT_XXL changes introduced a redefinition of SAVE_FLAGS under certain configurations. Cure it Fixes: 6da63eb241a0 ("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
-rw-r--r--arch/x86/include/asm/paravirt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 969343c72a9b..4bf42f9e4eea 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -914,7 +914,6 @@ extern void default_banner(void);
914 PARA_SITE(PARA_PATCH(PV_CPU_usergs_sysret64), \ 914 PARA_SITE(PARA_PATCH(PV_CPU_usergs_sysret64), \
915 ANNOTATE_RETPOLINE_SAFE; \ 915 ANNOTATE_RETPOLINE_SAFE; \
916 jmp PARA_INDIRECT(pv_ops+PV_CPU_usergs_sysret64);) 916 jmp PARA_INDIRECT(pv_ops+PV_CPU_usergs_sysret64);)
917#endif
918 917
919#ifdef CONFIG_DEBUG_ENTRY 918#ifdef CONFIG_DEBUG_ENTRY
920#define SAVE_FLAGS(clobbers) \ 919#define SAVE_FLAGS(clobbers) \
@@ -924,6 +923,7 @@ extern void default_banner(void);
924 call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); \ 923 call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); \
925 PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);) 924 PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);)
926#endif 925#endif
926#endif
927 927
928#endif /* CONFIG_X86_32 */ 928#endif /* CONFIG_X86_32 */
929 929