diff options
| author | Ingo Molnar | 2008-12-12 12:00:02 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-12-12 12:00:14 +0100 |
| commit | 92bf73e90a35d40ebc1446488218f03833b36f86 (patch) | |
| tree | 8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6 /kernel/sched.c | |
| parent | perf counters: update docs (diff) | |
| parent | x86: hardirq: introduce inc_irq_stat() (diff) | |
| download | kernel-qcow2-linux-92bf73e90a35d40ebc1446488218f03833b36f86.tar.gz kernel-qcow2-linux-92bf73e90a35d40ebc1446488218f03833b36f86.tar.xz kernel-qcow2-linux-92bf73e90a35d40ebc1446488218f03833b36f86.zip | |
Merge branch 'x86/irq' into perfcounters/core
( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
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 254d56de2548..5c3f4106314e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6611,7 +6611,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; |