Commit 8e0a43d8 authored Jun 23, 2006 by Ingo Molnar Committed by Linus Torvalds Jun 23, 2006

[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>

parent 6e667260

kernel/sched.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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