aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-09-22 08:38:44 +0200
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2010-09-23 08:25:17 -0700
commitb3a084b9b684622b149e8dcf03855bf0d5fb588b (patch)
tree0c04087b9819e64530f14aed21eb4e3453d75d53 /include
parent27c379f7f89a4d558c685b5d89b5ba2fe79ae701 (diff)
downloadmrst-s0i3-test-b3a084b9b684622b149e8dcf03855bf0d5fb588b.tar.gz
mrst-s0i3-test-b3a084b9b684622b149e8dcf03855bf0d5fb588b.tar.xz
mrst-s0i3-test-b3a084b9b684622b149e8dcf03855bf0d5fb588b.zip
rcu: rcu_read_lock_bh_held(): disabling irqs also disables bh
rcu_dereference_bh() doesnt know yet about hard irq being disabled, so lockdep can trigger in netpoll_rx() after commit f0f9deae9e7c4 (netpoll: Disable IRQ around RCU dereference in netpoll_rx) Reported-by: Miles Lane <miles.lane@gmail.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Tested-by: Miles Lane <miles.lane@gmail.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/rcupdate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 9fbc54a2585..83af1f8d8b7 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -454,7 +454,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
* Makes rcu_dereference_check() do the dirty work.
*/
#define rcu_dereference_bh(p) \
- rcu_dereference_check(p, rcu_read_lock_bh_held())
+ rcu_dereference_check(p, rcu_read_lock_bh_held() || irqs_disabled())
/**
* rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched