---

yaml --- r: 211275 b: refs/heads/master c: b3a084b h: refs/heads/master i: 211273: 851414b 211271: 8bd4c73 v: v3
git-mirror · Sep 23, 2010 · 0ffe3f3 · 0ffe3f3
1 parent 9a7d337
commit 0ffe3f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27c379f7f89a4d558c685b5d89b5ba2fe79ae701
+refs/heads/master: b3a084b9b684622b149e8dcf03855bf0d5fb588b
diff --git a/trunk/include/linux/rcupdate.h b/trunk/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