From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753679AbbC0LsN (ORCPT ); Fri, 27 Mar 2015 07:48:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37382 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753634AbbC0LsJ (ORCPT ); Fri, 27 Mar 2015 07:48:09 -0400 Date: Fri, 27 Mar 2015 04:47:34 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: luto@amacapital.net, oleg@redhat.com, rostedt@goodmis.org, bp@alien8.de, dvlasenk@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, ast@plumgrid.com, fweisbec@gmail.com, keescook@chromium.org, tglx@linutronix.de, wad@chromium.org, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, wad@chromium.org, ast@plumgrid.com, hpa@zytor.com, keescook@chromium.org, fweisbec@gmail.com, bp@alien8.de, dvlasenk@redhat.com, torvalds@linux-foundation.org, oleg@redhat.com, luto@amacapital.net, rostedt@goodmis.org In-Reply-To: <1427314468-12763-3-git-send-email-dvlasenk@redhat.com> References: <1427314468-12763-3-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/irq/tracing: Fold ARCH_LOCKDEP_SYS_EXIT defines into their users Git-Commit-ID: 7dc7cc0780b04935f1127fa22ee23e9d6daf166a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7dc7cc0780b04935f1127fa22ee23e9d6daf166a Gitweb: http://git.kernel.org/tip/7dc7cc0780b04935f1127fa22ee23e9d6daf166a Author: Denys Vlasenko AuthorDate: Wed, 25 Mar 2015 21:14:27 +0100 Committer: Ingo Molnar CommitDate: Fri, 27 Mar 2015 10:01:49 +0100 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: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1427314468-12763-3-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/irqflags.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index 55866c2..19355f3 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -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,14 +193,12 @@ 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 +#else # define LOCKDEP_SYS_EXIT # define LOCKDEP_SYS_EXIT_IRQ -# endif +#endif #endif /* __ASSEMBLY__ */ #endif