[PATCH] cpu_down() warning fix

Fix (harmless?) smp_processor_id() usage in preemptible section of
cpu_down.

Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/cpu.c b/kernel/cpu.c
index ebaba873ebadc754e51c4adb20545b3de8a864d5..b97f7f91ec6dcc06f6d303036ca45eb269407db5 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -132,7 +132,8 @@ int cpu_down(unsigned int cpu)
        __cpu_die(cpu);
 
        /* Move it here so it can run. */
-       kthread_bind(p, smp_processor_id());
+       kthread_bind(p, get_cpu());
+       put_cpu();
 
        /* CPU is completely dead: tell everyone.  Too late to complain. */
        if (notifier_call_chain(&cpu_chain, CPU_DEAD, (void *)(long)cpu)