diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 14:41:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-10 14:41:06 -0800 |
| commit | f9fc05e7620b3ffc93eeeda6d02fc70436676152 (patch) | |
| tree | 2934c5c638af9c5ef977b64c7b2175653461bf3a /kernel | |
| parent | b88ed20594db2c685555b68c52b693b75738b2f5 (diff) | |
| parent | 9a2bd244e18ffbb96c8b783210fda4eded7c7e6f (diff) | |
| download | kernel-crypto-f9fc05e7620b3ffc93eeeda6d02fc70436676152.tar.gz kernel-crypto-f9fc05e7620b3ffc93eeeda6d02fc70436676152.tar.xz kernel-crypto-f9fc05e7620b3ffc93eeeda6d02fc70436676152.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: CPU remove deadlock fix
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b7480fb5c3d..e4bb1dd7b30 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6587,7 +6587,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) req = list_entry(rq->migration_queue.next, struct migration_req, list); list_del_init(&req->list); + spin_unlock_irq(&rq->lock); complete(&req->done); + spin_lock_irq(&rq->lock); } spin_unlock_irq(&rq->lock); break; |