Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbZL1KNp (ORCPT ); Mon, 28 Dec 2009 05:13:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752346AbZL1KN0 (ORCPT ); Mon, 28 Dec 2009 05:13:26 -0500 Received: from hera.kernel.org ([140.211.167.34]:48207 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752325AbZL1KNW (ORCPT ); Mon, 28 Dec 2009 05:13:22 -0500 Date: Mon, 28 Dec 2009 10:10:39 GMT From: tip-bot for Thiago Farina Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, yinghai@kernel.org, arjan@linux.intel.com, tfransosi@gmail.com, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com, rostedt@goodmis.org, ak@linux.intel.com, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, yinghai@kernel.org, arjan@linux.intel.com, tfransosi@gmail.com, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com, rostedt@goodmis.org, ak@linux.intel.com, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1261332469-25298-1-git-send-email-tfransosi@gmail.com> References: <1261332469-25298-1-git-send-email-tfransosi@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/cleanups] kernel: Use CALLER_ADDR0 macro Message-ID: Git-Commit-ID: eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb X-Mailer: tip-git-log-daemon MIME-Version: 1.0 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 Content-Length: 2865 Lines: 88 Commit-ID: eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb Gitweb: http://git.kernel.org/tip/eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb Author: Thiago Farina AuthorDate: Sun, 20 Dec 2009 13:07:46 -0500 Committer: Ingo Molnar CommitDate: Mon, 28 Dec 2009 10:49:18 +0100 kernel: Use CALLER_ADDR0 macro Use CALLER_ADDR0 instead of (unsigned long)__builtin_return_address(0), since this macro was created for this. This patch was generated by: sed -i "s/(unsigned long)__builtin_return_address(0)/CALLER_ADDR0/g" path/to/file Signed-off-by: Thiago Farina Cc: Frederic Weisbecker Cc: Andi Kleen Cc: Arjan van de Ven Cc: Steven Rostedt Cc: Paul E. McKenney Cc: Yinghai Lu LKML-Reference: <1261332469-25298-1-git-send-email-tfransosi@gmail.com> Signed-off-by: Ingo Molnar --- kernel/panic.c | 2 +- kernel/softirq.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 5827f7b..55b0b71 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -129,7 +129,7 @@ NORET_TYPE void panic(const char * fmt, ...) { unsigned long caller; - caller = (unsigned long)__builtin_return_address(0); + caller = CALLER_ADDR0; disabled_wait(caller); } #endif diff --git a/kernel/softirq.c b/kernel/softirq.c index a09502e..979e029 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -116,7 +116,7 @@ static inline void __local_bh_disable(unsigned long ip) void local_bh_disable(void) { - __local_bh_disable((unsigned long)__builtin_return_address(0)); + __local_bh_disable(CALLER_ADDR0); } EXPORT_SYMBOL(local_bh_disable); @@ -132,7 +132,7 @@ void _local_bh_enable(void) WARN_ON_ONCE(!irqs_disabled()); if (softirq_count() == SOFTIRQ_OFFSET) - trace_softirqs_on((unsigned long)__builtin_return_address(0)); + trace_softirqs_on(CALLER_ADDR0); sub_preempt_count(SOFTIRQ_OFFSET); } @@ -167,7 +167,7 @@ static inline void _local_bh_enable_ip(unsigned long ip) void local_bh_enable(void) { - _local_bh_enable_ip((unsigned long)__builtin_return_address(0)); + _local_bh_enable_ip(CALLER_ADDR0); } EXPORT_SYMBOL(local_bh_enable); @@ -198,7 +198,7 @@ asmlinkage void __do_softirq(void) pending = local_softirq_pending(); account_system_vtime(current); - __local_bh_disable((unsigned long)__builtin_return_address(0)); + __local_bh_disable(CALLER_ADDR0); lockdep_softirq_enter(); cpu = smp_processor_id(); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/