diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-03-05 11:16:49 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-11 15:14:35 +0200 |
| commit | 44d7e4fbc08eca153ea4b436a1440639dff2c771 (patch) | |
| tree | 77f08d7bc390db0900e27575ab68f481a3d47d15 | |
| parent | x86/entry/64: Avoid pointless code when CONTEXT_TRACKING=n (diff) | |
| download | linux-44d7e4fbc08eca153ea4b436a1440639dff2c771.tar.xz linux-44d7e4fbc08eca153ea4b436a1440639dff2c771.zip | |
x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft
No users left since two years due to commit 21d375b6b34f ("x86/entry/64:
Remove the SYSCALL64 fast path")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200505134059.061301403@linutronix.de
| -rw-r--r-- | arch/x86/entry/thunk_64.S | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/irqflags.h | 24 |
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index dbe4493b534e..34f980c9b766 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -42,10 +42,6 @@ SYM_FUNC_END(\name) THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1 #endif -#ifdef CONFIG_DEBUG_LOCK_ALLOC - THUNK lockdep_sys_exit_thunk,lockdep_sys_exit -#endif - #ifdef CONFIG_PREEMPTION THUNK preempt_schedule_thunk, preempt_schedule THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace @@ -54,7 +50,6 @@ SYM_FUNC_END(\name) #endif #if defined(CONFIG_TRACE_IRQFLAGS) \ - || defined(CONFIG_DEBUG_LOCK_ALLOC) \ || defined(CONFIG_PREEMPTION) SYM_CODE_START_LOCAL_NOALIGN(.L_restore) popq %r11 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index 8a0e56e1dcc9..e00f064b009e 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -180,30 +180,6 @@ static inline int arch_irqs_disabled(void) # define TRACE_IRQS_ON # define TRACE_IRQS_OFF #endif -#ifdef CONFIG_DEBUG_LOCK_ALLOC -# ifdef CONFIG_X86_64 -# define LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk -# define LOCKDEP_SYS_EXIT_IRQ \ - TRACE_IRQS_ON; \ - sti; \ - call lockdep_sys_exit_thunk; \ - cli; \ - TRACE_IRQS_OFF; -# else -# define LOCKDEP_SYS_EXIT \ - pushl %eax; \ - pushl %ecx; \ - pushl %edx; \ - call lockdep_sys_exit; \ - popl %edx; \ - popl %ecx; \ - popl %eax; -# define LOCKDEP_SYS_EXIT_IRQ -# endif -#else -# define LOCKDEP_SYS_EXIT -# define LOCKDEP_SYS_EXIT_IRQ -#endif #endif /* __ASSEMBLY__ */ #endif |