* [PATCH] x86/paravirt: fix compile warning
@ 2018-09-05 5:37 Juergen Gross
2018-09-06 12:40 ` [tip:x86/paravirt] x86/paravirt: Prevent redefinition of SAVE_FLAGS macro tip-bot for Juergen Gross
0 siblings, 1 reply; 2+ messages in thread
From: Juergen Gross @ 2018-09-05 5:37 UTC (permalink / raw)
To: linux-kernel, x86; +Cc: hpa, tglx, mingo, Juergen Gross
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").
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/include/asm/paravirt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
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 */
--
2.16.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [tip:x86/paravirt] x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
2018-09-05 5:37 [PATCH] x86/paravirt: fix compile warning Juergen Gross
@ 2018-09-06 12:40 ` tip-bot for Juergen Gross
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Juergen Gross @ 2018-09-06 12:40 UTC (permalink / raw)
To: linux-tip-commits; +Cc: mingo, hpa, tglx, linux-kernel, jgross
Commit-ID: b7a5eb6aafa95fce45fc4dcbc195cb232fa1b76d
Gitweb: https://git.kernel.org/tip/b7a5eb6aafa95fce45fc4dcbc195cb232fa1b76d
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Wed, 5 Sep 2018 07:37:20 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
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").
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
---
arch/x86/include/asm/paravirt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-06 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-05 5:37 [PATCH] x86/paravirt: fix compile warning Juergen Gross
2018-09-06 12:40 ` [tip:x86/paravirt] x86/paravirt: Prevent redefinition of SAVE_FLAGS macro tip-bot for Juergen Gross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.