Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755963AbZLTSIO (ORCPT ); Sun, 20 Dec 2009 13:08:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755916AbZLTSIN (ORCPT ); Sun, 20 Dec 2009 13:08:13 -0500 Received: from qw-out-2122.google.com ([74.125.92.26]:47473 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755899AbZLTSIM (ORCPT ); Sun, 20 Dec 2009 13:08:12 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=dCBqHZb5aEGG+eky1InvaRB+FwGV8Ocetd2cahZQlsUS6AgAW3F405J9jqZql6bYxK Xq7uN4YKJQl9cRNefYIQMeAJZFSmUD/tdUsPopxF2xTvjaJNGSHBkgAR087gjNXhSQ1g pQ1SXppQpNIJrwr5NMCNi+VtYjkNFqP6C6UM4= From: Thiago Farina To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Frederic Weisbecker , Andrew Morton , Andi Kleen , Arjan van de Ven , Steven Rostedt , "Paul E. McKenney" , Yinghai Lu Subject: [PATCH 1/2] kernel: Use CALLER_ADDR0 macro. Date: Sun, 20 Dec 2009 13:07:46 -0500 Message-Id: <1261332469-25298-1-git-send-email-tfransosi@gmail.com> X-Mailer: git-send-email 1.6.6.rc3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2178 Lines: 73 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 --- 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(); -- 1.6.6.rc0.61.g41d5b -- 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/