aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 14:13:05 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:56 +0200
commit045f9d22029e94d6609d46f8ee07c63f4693dfb3 (patch)
tree2eea11b017c1614d5de9138d78436e1e3759bcdc /arch
parentfc25da9ec6c910976b76c70f7604a838679f75b2 (diff)
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')
-rw-r--r--arch/x86/kernel/smpboot_32.c7
-rw-r--r--arch/x86/kernel/smpboot_64.c8
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index a58ca7f1801..4939b3a01b2 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -1041,6 +1041,11 @@ void __init native_smp_prepare_boot_cpu(void)
}
#ifdef CONFIG_HOTPLUG_CPU
+static void __ref remove_cpu_from_maps(int cpu)
+{
+ cpu_clear(cpu, cpu_online_map);
+}
+
int __cpu_disable(void)
{
cpumask_t map = cpu_online_map;
@@ -1066,7 +1071,7 @@ int __cpu_disable(void)
remove_siblinginfo(cpu);
- cpu_clear(cpu, map);
+ remove_cpu_from_maps(cpu);
fixup_irqs(map);
/* It's now safe to remove this processor from the online map */
cpu_clear(cpu, cpu_online_map);
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index ca3a3c5b64f..6509d3c1b3d 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;
}