Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

softirq: Use _RET_IP_

Browse Source 
Use the already defined macro to pass the function return address.

Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1367347569.1784.3.camel@buesod1.americas.hpqcorp.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Davidlohr Bueso 2013-04-30 11:46:09 -07:00 committed by Thomas Gleixner
parent ccc414f839
commit d2e08473f2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/softirq.c
View File

@ -127,8 +127,7 @@ static inline void __local_bh_disable(unsigned long ip, unsigned int cnt)
void local_bh_disable(void) void local_bh_disable(void)
{ {
__local_bh_disable((unsigned long)__builtin_return_address(0), __local_bh_disable(_RET_IP_, SOFTIRQ_DISABLE_OFFSET);
SOFTIRQ_DISABLE_OFFSET);
} }
EXPORT_SYMBOL(local_bh_disable); EXPORT_SYMBOL(local_bh_disable);
@ -139,7 +138,7 @@ static void __local_bh_enable(unsigned int cnt)
WARN_ON_ONCE(!irqs_disabled()); WARN_ON_ONCE(!irqs_disabled());
if (softirq_count() == cnt) if (softirq_count() == cnt)
trace_softirqs_on((unsigned long)__builtin_return_address(0)); trace_softirqs_on(_RET_IP_);
sub_preempt_count(cnt); sub_preempt_count(cnt);
} }
@ -184,7 +183,7 @@ static inline void _local_bh_enable_ip(unsigned long ip)
void local_bh_enable(void) void local_bh_enable(void)
{ {
_local_bh_enable_ip((unsigned long)__builtin_return_address(0)); _local_bh_enable_ip(_RET_IP_);
} }
EXPORT_SYMBOL(local_bh_enable); EXPORT_SYMBOL(local_bh_enable);
@ -223,8 +222,7 @@ asmlinkage void __do_softirq(void)
pending = local_softirq_pending(); pending = local_softirq_pending();
account_irq_enter_time(current); account_irq_enter_time(current);
__local_bh_disable((unsigned long)__builtin_return_address(0), __local_bh_disable(_RET_IP_, SOFTIRQ_OFFSET);
SOFTIRQ_OFFSET);
lockdep_softirq_enter(); lockdep_softirq_enter();
cpu = smp_processor_id(); cpu = smp_processor_id();