Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e08473 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Thomas Gleixner
Browse files

softirq: Use _RET_IP_ 



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

Signed-off-by: default avatarDavidlohr 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent ccc414f8

kernel/softirq.c

+4 −6
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static inline void __local_bh_disable(unsigned long ip, unsigned int cnt) 


void local_bh_disable(void)

{

	__local_bh_disable((unsigned long)__builtin_return_address(0),

				SOFTIRQ_DISABLE_OFFSET);

	__local_bh_disable(_RET_IP_, SOFTIRQ_DISABLE_OFFSET);

}



EXPORT_SYMBOL(local_bh_disable);
@@ -139,7 +138,7 @@ static void __local_bh_enable(unsigned int cnt) 
	WARN_ON_ONCE(!irqs_disabled());



	if (softirq_count() == cnt)

		trace_softirqs_on((unsigned long)__builtin_return_address(0));

		trace_softirqs_on(_RET_IP_);

	sub_preempt_count(cnt);

}
@@ -184,7 +183,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(_RET_IP_);

}

EXPORT_SYMBOL(local_bh_enable);
@@ -223,8 +222,7 @@ asmlinkage void __do_softirq(void) 
	pending = local_softirq_pending();

	account_irq_enter_time(current);



	__local_bh_disable((unsigned long)__builtin_return_address(0),

				SOFTIRQ_OFFSET);

	__local_bh_disable(_RET_IP_, SOFTIRQ_OFFSET);

	lockdep_softirq_enter();



	cpu = smp_processor_id();