diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-06-23 02:05:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 07:43:04 -0700 |
| commit | 8e0a43d8fa953179505869ec28de78550246e795 (patch) | |
| tree | 1fc56d6337c487952ab008b8ff063b2a2d48ee02 /kernel | |
| parent | 6e6672604773b9bae44d88d38afdf0763c104b1c (diff) | |
| download | blackbird-op-linux-8e0a43d8fa953179505869ec28de78550246e795.tar.gz blackbird-op-linux-8e0a43d8fa953179505869ec28de78550246e795.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 3 |
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) 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 |
