aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNathan Lynch <nathanl@austin.ibm.com>2005-01-07 22:00:31 -0800
committerLinus Torvalds <torvalds@evo.osdl.org>2005-01-07 22:00:31 -0800
commite975169bcfca519ad2b280fbfdd12bbef11ee6b7 (patch)
treea6f386ad8af3f9e7954fbba0e1fd6626dd6ce015 /kernel
parentdc85272201ccb0a3281e56507f83d6d920ac5405 (diff)
downloadhistory-e975169bcfca519ad2b280fbfdd12bbef11ee6b7.tar.gz
[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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index ebaba873ebadc7..b97f7f91ec6dcc 100644
--- 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)