lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix possible recursive rq->lock
This commit is contained in:
Linus Torvalds
2009-01-07 15:43:58 -08:00
parent b424e8d3b4 da8d5089da
commit 8cfc7f9c00
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sched.c
View File

@@ -3728,8 +3728,13 @@ redo:
} }
double_unlock_balance(this_rq, busiest); double_unlock_balance(this_rq, busiest);
/*
* Should not call ttwu while holding a rq->lock
*/
spin_unlock(&this_rq->lock);
if (active_balance) if (active_balance)
wake_up_process(busiest->migration_thread); wake_up_process(busiest->migration_thread);
spin_lock(&this_rq->lock);
} else } else
sd->nr_balance_failed = 0; sd->nr_balance_failed = 0;