aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-06-23 05:05:23 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:04 -0400
commit8e0a43d8fa953179505869ec28de78550246e795 (patch)
tree1fc56d6337c487952ab008b8ff063b2a2d48ee02
parent6e6672604773b9bae44d88d38afdf0763c104b1c (diff)
[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>
-rw-r--r--kernel/sched.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 87665132cec1..5dbc42694477 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4053,6 +4053,9 @@ asmlinkage long sys_sched_yield(void)
4053 4053
4054static inline void __cond_resched(void) 4054static inline void __cond_resched(void)
4055{ 4055{
4056#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
4057 __might_sleep(__FILE__, __LINE__);
4058#endif
4056 /* 4059 /*
4057 * The BKS might be reacquired before we have dropped 4060 * The BKS might be reacquired before we have dropped
4058 * PREEMPT_ACTIVE, which could trigger a second 4061 * PREEMPT_ACTIVE, which could trigger a second