aboutsummaryrefslogtreecommitdiff
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2016-11-17 13:12:33 +0000
committerDaniel Thompson <daniel.thompson@linaro.org>2017-03-30 19:29:02 +0100
commit0ab44db1752bb96ae49726a386ead41b3298c5e9 (patch)
tree348f676c9ea6e3ef4971ac1fd33877773599b396 /kernel/softirq.c
parent2b1c4a606c0622c991920789d6ff00137ab041b6 (diff)
BUG HUNTING: Big pile of additional irqs_disabled() tests
Most of these do not trigger on rel10p0. Leads to the conclusion that something came along and crapped over the PMR registers. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 744fa611cae0..b1870343667f 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -158,7 +158,8 @@ EXPORT_SYMBOL(_local_bh_enable);
void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
{
- WARN_ON_ONCE(in_irq() || irqs_disabled());
+ WARN_ON_ONCE(in_irq());
+ WARN_ON_ONCE(irqs_disabled());
#ifdef CONFIG_TRACE_IRQFLAGS
local_irq_disable();
#endif