projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e66726
)
[PATCH] cond_resched() might_sleep() fix
author
Ingo Molnar
<mingo@elte.hu>
Fri, 23 Jun 2006 09:05:23 +0000
(
02:05
-0700)
committer
Linus 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
patch
|
blob
|
history
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
8766513
..
5dbc426
100644
(file)
--- 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