aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-01-30 07:33:39 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:39 -0500
commit23916d49155552767726f116daf32dfb2aa3af23 (patch)
tree23fe5c6a6914c2465b9ecd94092e20707e86aa52 /arch/x86/kernel
parent07035f076febf5fd791edbdac0e6d3f2f0e00a01 (diff)
x86: not set boot cpu in cpu_online_map in smp_prepare_boot_cpu()
in init/main.c boot_cpu_init() does that before. Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/smpboot_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 4e14ecb90764..cc64b8085c2a 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -921,7 +921,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
921void __init smp_prepare_boot_cpu(void) 921void __init smp_prepare_boot_cpu(void)
922{ 922{
923 int me = smp_processor_id(); 923 int me = smp_processor_id();
924 cpu_set(me, cpu_online_map); 924 /* already set me in cpu_online_map in boot_cpu_init() */
925 cpu_set(me, cpu_callout_map); 925 cpu_set(me, cpu_callout_map);
926 per_cpu(cpu_state, me) = CPU_ONLINE; 926 per_cpu(cpu_state, me) = CPU_ONLINE;
927} 927}