[PATCH] cpu hoptlug: avoid usage of smp_processor_id() in preemptible code

[linux-2.6-block.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index b4f4eb6135372d258d51ded475ff68c5517c2614..013f1448006bc288f438b9f0af2620aa58004086 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4680,7 +4680,8 @@ static int migration_call(struct notifier_block *nfb, unsigned long action,
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_UP_CANCELED:
                /* Unbind it from offline cpu so it can run.  Fall thru. */
-               kthread_bind(cpu_rq(cpu)->migration_thread,smp_processor_id());
+               kthread_bind(cpu_rq(cpu)->migration_thread,
+                            any_online_cpu(cpu_online_map));
                kthread_stop(cpu_rq(cpu)->migration_thread);
                cpu_rq(cpu)->migration_thread = NULL;
                break;