aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-05 13:07:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-05 13:07:43 -0700
commite1d9694cae722d00a94fb58f901aa69c9c324a16 (patch)
tree19a7f36292adbc178ba4fac6f2f9e1acadb1b3f1 /include
parent39c12be86aaedd2f81bfb2236aca5333a2334dea (diff)
parentb3a084b9b684622b149e8dcf03855bf0d5fb588b (diff)
downloadmrst-s0i3-test-e1d9694cae722d00a94fb58f901aa69c9c324a16.tar.gz
mrst-s0i3-test-e1d9694cae722d00a94fb58f901aa69c9c324a16.tar.xz
mrst-s0i3-test-e1d9694cae722d00a94fb58f901aa69c9c324a16.zip
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: rcu_read_lock_bh_held(): disabling irqs also disables bh generic-ipi: Fix deadlock in __smp_call_function_single
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