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 */