Skip to contentSkip to conversation

x86/paravirt: fix compile warning

PATCH New Juergen Gross 2 participants 2 messages Sep 5, 2018 – Sep 6, 2018

Subsystems (2)
lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH 1/1 x86/paravirt: fix compile warning

Fix a compile warning "SAVE_FLAGS redefined" introduced recently by tip.git commit: 6da63eb241a05b0e676d6 ("x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella").

---
 arch/x86/include/asm/paravirt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/paravirt.h +1 -1
index 969343c72a9b..4bf42f9e4eea 100644
@@ -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 */
 
Signature · 1 line
2.16.4
#1 lore raw

[tip:x86/paravirt] x86/paravirt: Prevent redefinition of SAVE_FLAGS macro

x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
Commit-ID:  b7a5eb6aafa95fce45fc4dcbc195cb232fa1b76d
Gitweb:     https://git.kernel.org/tip/b7a5eb6aafa95fce45fc4dcbc195cb232fa1b76d
Author:     Juergen Gross <[email protected]>
AuthorDate: Wed, 5 Sep 2018 07:37:20 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 6 Sep 2018 14:37:37 +0200

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").
---
 arch/x86/include/asm/paravirt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/paravirt.h +1 -1
index 969343c72a9b..4bf42f9e4eea 100644
@@ -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 */