Borislav Petkov
2015-Apr-03  08:28 UTC
[PATCH] x86/asm/entry: Drop now unused ENABLE_INTERRUPTS_SYSEXIT32
From: Borislav Petkov <bp at suse.de>
Commit
  4214a16b0297 ("x86/asm/entry/64/compat: Use SYSRETL to return from compat
mode SYSENTER")
removed the last user of ENABLE_INTERRUPTS_SYSEXIT32. Kill the macro now
too.
Signed-off-by: Borislav Petkov <bp at suse.de>
Cc: Andy Lutomirski <luto at amacapital.net>
Cc: Brian Gerst <brgerst at gmail.com>
Cc: Denys Vlasenko <dvlasenk at redhat.com>
Cc: H. Peter Anvin <hpa at zytor.com>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ingo Molnar <mingo at kernel.org>
Cc: virtualization at lists.linux-foundation.org
---
 arch/x86/include/asm/irqflags.h | 4 ----
 arch/x86/include/asm/paravirt.h | 5 -----
 2 files changed, 9 deletions(-)
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 9a63eae04e4b..b77f5edb03b0 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -136,10 +136,6 @@ static inline notrace unsigned long
arch_local_irq_save(void)
 #define USERGS_SYSRET32				\
 	swapgs;					\
 	sysretl
-#define ENABLE_INTERRUPTS_SYSEXIT32		\
-	swapgs;					\
-	sti;					\
-	sysexit
 
 #else
 #define INTERRUPT_RETURN		iret
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 965c47d254aa..5f6051d5d139 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -976,11 +976,6 @@ extern void default_banner(void);
 	PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64),	\
 		  CLBR_NONE,						\
 		  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
-
-#define ENABLE_INTERRUPTS_SYSEXIT32					\
-	PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit),	\
-		  CLBR_NONE,						\
-		  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
 #endif	/* CONFIG_X86_32 */
 
 #endif /* __ASSEMBLY__ */
-- 
2.3.3
Seemingly Similar Threads
- [PATCH] x86/asm/entry: Drop now unused ENABLE_INTERRUPTS_SYSEXIT32
- [PATCH 3/3] x86: usergs_sysret32 pv op is no longer needed
- [PATCH 06/13] x86/paravirt: Clean up paravirt-asm.h
- [PATCH 4.4 67/86] x86/paravirt: Remove the unused irq_enable_sysexit pv op
- [PATCH 2/3] x86: irq_enable_sysexit pv op is no longer needed
