diff options
| author | Glauber Costa | 2008-03-03 18:13:05 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-04-17 17:40:56 +0200 |
| commit | 045f9d22029e94d6609d46f8ee07c63f4693dfb3 (patch) | |
| tree | 2eea11b017c1614d5de9138d78436e1e3759bcdc /arch/x86/kernel/smpboot_64.c | |
| parent | x86: remove vector_lock around cpu_online_map (diff) | |
| download | kernel-qcow2-linux-045f9d22029e94d6609d46f8ee07c63f4693dfb3.tar.gz kernel-qcow2-linux-045f9d22029e94d6609d46f8ee07c63f4693dfb3.tar.xz kernel-qcow2-linux-045f9d22029e94d6609d46f8ee07c63f4693dfb3.zip | |
x86: use remove_from_maps in cpu_disable
it is already used in x86_64. In i386, it only
removes from cpu_online_map
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
| -rw-r--r-- | arch/x86/kernel/smpboot_64.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index ca3a3c5b64fe..6509d3c1b3df 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c @@ -838,10 +838,9 @@ void __init native_smp_cpus_done(unsigned int max_cpus) } #ifdef CONFIG_HOTPLUG_CPU -static void __ref remove_cpu_from_maps(void) +static void __ref remove_cpu_from_maps(int cpu) { - int cpu = smp_processor_id(); - + cpu_clear(cpu, cpu_online_map); cpu_clear(cpu, cpu_callout_map); cpu_clear(cpu, cpu_callin_map); clear_bit(cpu, (unsigned long *)&cpu_initialized); /* was set by cpu_init() */ @@ -880,8 +879,7 @@ int __cpu_disable(void) remove_siblinginfo(cpu); /* It's now safe to remove this processor from the online map */ - cpu_clear(cpu, cpu_online_map); - remove_cpu_from_maps(); + remove_cpu_from_maps(cpu); fixup_irqs(cpu_online_map); return 0; } |