projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
softirq: Use _RET_IP_
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index
b5197dc
..
a5f8836
100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-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),
- SOFTIRQ_DISABLE_OFFSET);
+ __local_bh_disable(_RET_IP_, 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());
if (softirq_count() == 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);
}
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();
account_irq_enter_time(current);
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();
lockdep_softirq_enter();
cpu = smp_processor_id();