From 18a3c09bcb9dccd814e51c3db424c636b256af1c Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Fri, 26 Feb 2010 16:38:57 -0800
Subject: [PATCH] --- yaml --- r: 182267 b: refs/heads/master c:
 0b1c87278a8c7e394022ec184a0b44a3886b6fde h: refs/heads/master i:   182265:
 24bb9c0cf53f3a4067bf7332d1c438dc4b842532   182263:
 f6d4b002ac82f35f9344c9dbc70d26bdb29d972a v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/rcupdate.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c3fbe92ae0e5..610656ed9f6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a47cd880b50e14b0b6f5e9d426ae9a2676c9c474
+refs/heads/master: 0b1c87278a8c7e394022ec184a0b44a3886b6fde
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index fcea332a8424..c84373626336 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -166,7 +166,7 @@ static inline int rcu_read_lock_bh_held(void)
 
 static inline int rcu_read_lock_sched_held(void)
 {
-	return preempt_count() != 0;
+	return preempt_count() != 0 || !rcu_scheduler_active;
 }
 
 #endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */