From 0ffe3f3fa6328079c0405e8305e3c74a8d7a0153 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 22 Sep 2010 08:38:44 +0200 Subject: [PATCH] --- yaml --- r: 211275 b: refs/heads/master c: b3a084b9b684622b149e8dcf03855bf0d5fb588b h: refs/heads/master i: 211273: 851414bdfdfe601040fa65026611a67d1123368a 211271: 8bd4c738833678e7a19e598d613f448e75d3cac5 v: v3 --- [refs] | 2 +- trunk/include/linux/rcupdate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc80c84ab46e..ca7d341b14cb 100644 --- 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 index 9fbc54a2585d..83af1f8d8b74 100644 --- 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