diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 04:29:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 04:29:35 -0500 |
| commit | c1dfdc7597d051b09555d4ae2acb90403e238746 (patch) | |
| tree | 86aa49f5a2ab25459f9196dd6724bbe6645b1375 /kernel/sched.c | |
| parent | efbe027e95dc13ac343b6130948418d7ead7ddf1 (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
Merge commit 'v2.6.28-rc8' into sched/core
Diffstat (limited to 'kernel/sched.c')
| -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 bb9c6384d077..ef212da928e8 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -6564,7 +6564,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 6564 | req = list_entry(rq->migration_queue.next, | 6564 | req = list_entry(rq->migration_queue.next, |
| 6565 | struct migration_req, list); | 6565 | struct migration_req, list); |
| 6566 | list_del_init(&req->list); | 6566 | list_del_init(&req->list); |
| 6567 | spin_unlock_irq(&rq->lock); | ||
| 6567 | complete(&req->done); | 6568 | complete(&req->done); |
| 6569 | spin_lock_irq(&rq->lock); | ||
| 6568 | } | 6570 | } |
| 6569 | spin_unlock_irq(&rq->lock); | 6571 | spin_unlock_irq(&rq->lock); |
| 6570 | break; | 6572 | break; |
