commit 8e0a43d8fa953179505869ec28de78550246e795
author Ingo Molnar <mingo@elte.hu> Fri Jun 23 02:05:23 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Jun 23 07:43:04 2006 -0700
tree 1fc56d6337c487952ab008b8ff063b2a2d48ee02
parent 6e6672604773b9bae44d88d38afdf0763c104b1c

[PATCH] cond_resched() might_sleep() fix

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

kernel/sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 8766513..5dbc426 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4053,6 +4053,9 @@
 
 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