Re: [patch V4 part 1 10/36] x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft

Alexandre Chartre
2020-05-06T13:54:20Z

On 5/5/20 3:16 PM, Thomas Gleixner wrote:
> 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>
> ---
> arch/x86/entry/thunk_64.S | 5 -----
> arch/x86/include/asm/irqflags.h | 24 ------------------------
> 2 files changed, 29 deletions(-)

Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>

alex.

> --- 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
> --- a/arch/x86/include/asm/irqflags.h
> +++ b/arch/x86/include/asm/irqflags.h
> @@ -180,30 +180,6 @@ static inline int arch_irqs_disabled(voi
> # 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
>