From: Glauber Costa Date: Wed, 4 Jun 2008 05:05:03 +0000 (-0300) Subject: x86: remove cpu from maps X-Git-Tag: v2.6.27-rc1~1106^2~230 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b553a1e0ff48bd66fd18f705370e47c0b4ecea61;p=linux-2.6-omap-h63xx.git x86: remove cpu from maps during cpu disable, take cpus out of all maps in i386, instead of just the online map. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index b99c386af77..820c23dbe76 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1319,13 +1319,11 @@ __init void prefill_possible_map(void) static void __ref remove_cpu_from_maps(int cpu) { cpu_clear(cpu, cpu_online_map); -#ifdef CONFIG_X86_64 cpu_clear(cpu, cpu_callout_map); cpu_clear(cpu, cpu_callin_map); /* was set by cpu_init() */ clear_bit(cpu, (unsigned long *)&cpu_initialized); numa_remove_cpu(cpu); -#endif } int __cpu_disable(void)