]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] cond_resched() might_sleep() fix
authorIngo Molnar <mingo@elte.hu>
Fri, 23 Jun 2006 09:05:23 +0000 (02:05 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 14:43:04 +0000 (07:43 -0700)
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

index 87665132cec1639d3e9640884cc612f4a850e189..5dbc426944779a33eaf30e2cc476906c4b39983a 100644 (file)
@@ -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