sched: Fix hotplug hang
authorPeter Zijlstra <peterz@infradead.org>
Sun, 20 Dec 2009 16:36:27 +0000 (17:36 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 20 Dec 2009 22:31:23 +0000 (23:31 +0100)
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>
kernel/sched.c

index 7ffde2ae78686bff26a5e6781ed27cc5051bcbcd..87f1f47beffe95527fa36c5b3efef16a481aba76 100644 (file)
@@ -2346,7 +2346,7 @@ int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags)
         *   not worry about this generic constraint ]
         */
        if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
-                    !cpu_active(cpu)))
+                    !cpu_online(cpu)))
                cpu = select_fallback_rq(task_cpu(p), p);
 
        return cpu;