diff options
author | Peter Zijlstra <peterz@infradead.org> | 2009-12-20 11:36:27 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-20 17:31:23 -0500 |
commit | 70f1120527797adb31c68bdc6f1b45e182c342c7 (patch) | |
tree | d2b5f85f3c0f7c9a162828362d3e5f587df56e20 | |
parent | 3df0fc5b2e9d8092dcaeb5ae0b6753d85c851d66 (diff) |
sched: Fix hotplug hang
The hot-unplug kstopmachine usage does a wakeup after
deactivating the cpu, hence we cannot use cpu_active()
here but must rely on the good olde online.
Reported-by: Sachin Sant <sachinp@in.ibm.com>
Reported-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Tested-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
LKML-Reference: <1261326987.4314.24.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 7ffde2ae7868..87f1f47beffe 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2346,7 +2346,7 @@ int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags) | |||
2346 | * not worry about this generic constraint ] | 2346 | * not worry about this generic constraint ] |
2347 | */ | 2347 | */ |
2348 | if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) || | 2348 | if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) || |
2349 | !cpu_active(cpu))) | 2349 | !cpu_online(cpu))) |
2350 | cpu = select_fallback_rq(task_cpu(p), p); | 2350 | cpu = select_fallback_rq(task_cpu(p), p); |
2351 | 2351 | ||
2352 | return cpu; | 2352 | return cpu; |