---

yaml --- r: 288564 b: refs/heads/master c: 50406b9 h: refs/heads/master v: v3
git-mirror · Feb 21, 2012 · 5ec47ba · 5ec47ba
1 parent b1b82f3
commit 5ec47ba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c44e2cddacc2cf299186bad5697d738ea19668b7
+refs/heads/master: 50406b98b6372e7de21d903d2cf3914e9d64e094
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
@@ -381,8 +381,22 @@ extern int rcu_my_thread_group_empty(void);
 		}							\
 	} while (0)
 
+#if defined(CONFIG_PROVE_RCU) && !defined(CONFIG_PREEMPT_RCU)
+static inline void rcu_preempt_sleep_check(void)
+{
+	rcu_lockdep_assert(!lock_is_held(&rcu_lock_map),
+			   "Illegal context switch in RCU read-side "
+			   "critical section");
+}
+#else /* #ifdef CONFIG_PROVE_RCU */
+static inline void rcu_preempt_sleep_check(void)
+{
+}
+#endif /* #else #ifdef CONFIG_PROVE_RCU */
+
 #define rcu_sleep_check()						\
 	do {								\
+		rcu_preempt_sleep_check();				\
 		rcu_lockdep_assert(!lock_is_held(&rcu_bh_lock_map),	\
 				   "Illegal context switch in RCU-bh"	\
 				   " read-side critical section");	\