[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>
This commit is contained in:
parent
6e66726047
commit
8e0a43d8fa
1 changed files with 3 additions and 0 deletions
|
@ -4053,6 +4053,9 @@ asmlinkage long sys_sched_yield(void)
|
||||||
|
|
||||||
static inline void __cond_resched(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
|
* The BKS might be reacquired before we have dropped
|
||||||
* PREEMPT_ACTIVE, which could trigger a second
|
* PREEMPT_ACTIVE, which could trigger a second
|
||||||
|
|
Loading…
Reference in a new issue