---

yaml --- r: 29044 b: refs/heads/master c: 8e0a43d h: refs/heads/master v: v3
git-mirror · Jun 23, 2006 · cd6e9cb · cd6e9cb
1 parent 1ce4723
commit cd6e9cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6672604773b9bae44d88d38afdf0763c104b1c
+refs/heads/master: 8e0a43d8fa953179505869ec28de78550246e795
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4053,6 +4053,9 @@ asmlinkage long sys_sched_yield(void)
 
 static inline void __cond_resched(void)
 {
+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+	__might_sleep(__FILE__, __LINE__);
+#endif
 	/*
 	 * The BKS might be reacquired before we have dropped
 	 * PREEMPT_ACTIVE, which could trigger a second