From: Ingo Molnar <mingo@elte.hu>

add the __might_sleep() check back to cond_resched().

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/sched.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN kernel/sched.c~cond-resched-might-sleep-fix kernel/sched.c
--- devel/kernel/sched.c~cond-resched-might-sleep-fix	2006-06-09 15:22:07.000000000 -0700
+++ devel-akpm/kernel/sched.c	2006-06-09 15:22:07.000000000 -0700
@@ -4051,6 +4051,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
_