diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2010-10-05 14:03:02 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2010-10-05 14:03:02 -0700 |
| commit | 773e3f93577ffb493fb7c39b1a6ecf39b5748e87 (patch) | |
| tree | 78340c40e26e3dbcbde66b013710b6c916ecc05b /kernel/rcupdate.c | |
| parent | b3a084b9b684622b149e8dcf03855bf0d5fb588b (diff) | |
| download | olio-linux-3.10-773e3f93577ffb493fb7c39b1a6ecf39b5748e87.tar.xz olio-linux-3.10-773e3f93577ffb493fb7c39b1a6ecf39b5748e87.zip | |
rcu: move check from rcu_dereference_bh to rcu_read_lock_bh_held
As suggested by Linus, push the irqs_disabled() down to the
rcu_read_lock_bh_held() level so that all callers get the benefit
of the correct check.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcupdate.c')
| -rw-r--r-- | kernel/rcupdate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 4d169835fb3..0af1dc70fec 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c @@ -86,7 +86,7 @@ int rcu_read_lock_bh_held(void) { if (!debug_lockdep_rcu_enabled()) return 1; - return in_softirq(); + return in_softirq() || irqs_disabled(); } EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); |