lkml.org 
[lkml]   [2009]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:core/cleanups] kernel: Use CALLER_ADDR0 macro
    Commit-ID:  eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb
    Gitweb: http://git.kernel.org/tip/eba3fe4416f3cc2ce043fb304b6c35a69dca3bdb
    Author: Thiago Farina <tfransosi@gmail.com>
    AuthorDate: Sun, 20 Dec 2009 13:07:46 -0500
    Committer: Ingo Molnar <mingo@elte.hu>
    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 <tfransosi@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: Yinghai Lu <yinghai@kernel.org>
    LKML-Reference: <1261332469-25298-1-git-send-email-tfransosi@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    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();

    \
     
     \ /
      Last update: 2009-12-28 11:17    [W:0.024 / U:30.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site