---

yaml --- r: 182267 b: refs/heads/master c: 0b1c872 h: refs/heads/master i: 182265: 24bb9c0 182263: f6d4b00 v: v3
git-mirror · Feb 27, 2010 · 18a3c09 · 18a3c09
1 parent 703e453
commit 18a3c09
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: a47cd880b50e14b0b6f5e9d426ae9a2676c9c474
+refs/heads/master: 0b1c87278a8c7e394022ec184a0b44a3886b6fde
diff --git 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 */