Commit 7dc7cc07 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

x86/irq/tracing: Fold ARCH_LOCKDEP_SYS_EXIT defines into their users 



There is no need to have an extra level of macro indirection
here.

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1427314468-12763-3-git-send-email-dvlasenk@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 40e2ec65

arch/x86/include/asm/irqflags.h

+7 −9
Original line number Diff line number Diff line
@@ -175,17 +175,17 @@ static inline int arch_irqs_disabled(void) 
#endif

#ifdef CONFIG_DEBUG_LOCK_ALLOC

#  ifdef CONFIG_X86_64

#    define ARCH_LOCKDEP_SYS_EXIT	call lockdep_sys_exit_thunk

#    define ARCH_LOCKDEP_SYS_EXIT_IRQ \

#    define LOCKDEP_SYS_EXIT		call lockdep_sys_exit_thunk

#    define LOCKDEP_SYS_EXIT_IRQ \

	TRACE_IRQS_ON; \

	sti; \

	SAVE_EXTRA_REGS; \

	LOCKDEP_SYS_EXIT; \

	call lockdep_sys_exit_thunk; \

	RESTORE_EXTRA_REGS; \

	cli; \

	TRACE_IRQS_OFF;

#  else

#    define ARCH_LOCKDEP_SYS_EXIT \

#    define LOCKDEP_SYS_EXIT \

	pushl %eax;				\

	pushl %ecx;				\

	pushl %edx;				\
@@ -193,10 +193,8 @@ static inline int arch_irqs_disabled(void) 
	popl %edx;				\

	popl %ecx;				\

	popl %eax;

#    define ARCH_LOCKDEP_SYS_EXIT_IRQ

#    define LOCKDEP_SYS_EXIT_IRQ

#  endif

#  define LOCKDEP_SYS_EXIT	ARCH_LOCKDEP_SYS_EXIT

#  define LOCKDEP_SYS_EXIT_IRQ	ARCH_LOCKDEP_SYS_EXIT_IRQ

#else

#  define LOCKDEP_SYS_EXIT

#  define LOCKDEP_SYS_EXIT_IRQ

CRA Git | Maintained and supported by SUSTech CRA and CCSE