x86/irq/tracing: Move ARCH_LOCKDEP_SYS_EXIT defines closer to their users (40e2ec65) · Commits · 戴 / test

This change simply moves defines around (even if it's not obvious in a patch form). Nothing is changed. This is a preparation for folding ARCH_LOCKDEP_SYS_EXIT defines into their users. Signed-off-by:

Denys 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-2-git-send-email-dvlasenk@redhat.com Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/include/asm/irqflags.h

+17 −20

Original line number	Diff line number	Diff line
		@@ -163,9 +163,17 @@ static inline int arch_irqs_disabled(void)

		return arch_irqs_disabled_flags(flags);
		}
		#endif /* !__ASSEMBLY__ */

		#ifdef __ASSEMBLY__
		#ifdef CONFIG_TRACE_IRQFLAGS
		# define TRACE_IRQS_ON call trace_hardirqs_on_thunk;
		# define TRACE_IRQS_OFF call trace_hardirqs_off_thunk;
		#else

		# define TRACE_IRQS_ON
		# define TRACE_IRQS_OFF
		#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 \
		@@ -176,7 +184,6 @@ static inline int arch_irqs_disabled(void)
		RESTORE_EXTRA_REGS; \
		cli; \
		TRACE_IRQS_OFF;

		# else
		# define ARCH_LOCKDEP_SYS_EXIT \
		pushl %eax; \
		@@ -186,24 +193,14 @@ static inline int arch_irqs_disabled(void)
		popl %edx; \
		popl %ecx; \
		popl %eax;

		# define ARCH_LOCKDEP_SYS_EXIT_IRQ
		# endif

		#ifdef CONFIG_TRACE_IRQFLAGS
		# define TRACE_IRQS_ON call trace_hardirqs_on_thunk;
		# define TRACE_IRQS_OFF call trace_hardirqs_off_thunk;
		#else
		# define TRACE_IRQS_ON
		# define TRACE_IRQS_OFF
		#endif
		#ifdef CONFIG_DEBUG_LOCK_ALLOC
		# 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
		# endif

		#endif /* __ASSEMBLY__ */

		#endif

Admin message