aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 13:25:44 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:02 -0400
commitddd10ecfa231c88382fc2f10a3120d2ad8e92381 (patch)
tree45dad81e93affd4aa6b4ada44e51563039bba4c2
parent9713277607f9eac7d655c6854dd92bc2ce1b6f02 (diff)
x86: get rid of commenced mask.
As we now boot cpus from cpu_up, we don't need it. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/smpboot_32.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 978e13708ddb..c30abed08923 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -59,8 +59,6 @@
59#include <asm/vmi.h> 59#include <asm/vmi.h>
60#include <asm/mtrr.h> 60#include <asm/mtrr.h>
61 61
62static cpumask_t smp_commenced_mask;
63
64/* which logical CPU number maps to which CPU (physical APIC ID) */ 62/* which logical CPU number maps to which CPU (physical APIC ID) */
65u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata = 63u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
66 { [0 ... NR_CPUS-1] = BAD_APICID }; 64 { [0 ... NR_CPUS-1] = BAD_APICID };
@@ -180,8 +178,6 @@ static void __cpuinit start_secondary(void *unused)
180 cpu_init(); 178 cpu_init();
181 preempt_disable(); 179 preempt_disable();
182 smp_callin(); 180 smp_callin();
183 while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
184 cpu_relax();
185 181
186 /* otherwise gcc will move up smp_processor_id before the cpu_init */ 182 /* otherwise gcc will move up smp_processor_id before the cpu_init */
187 barrier(); 183 barrier();
@@ -667,7 +663,6 @@ void cpu_exit_clear(void)
667 cpu_clear(cpu, cpu_callout_map); 663 cpu_clear(cpu, cpu_callout_map);
668 cpu_clear(cpu, cpu_callin_map); 664 cpu_clear(cpu, cpu_callin_map);
669 665
670 cpu_clear(cpu, smp_commenced_mask);
671 unmap_cpu_to_logical_apicid(cpu); 666 unmap_cpu_to_logical_apicid(cpu);
672} 667}
673#endif 668#endif
@@ -827,7 +822,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
827void __init native_smp_prepare_cpus(unsigned int max_cpus) 822void __init native_smp_prepare_cpus(unsigned int max_cpus)
828{ 823{
829 nmi_watchdog_default(); 824 nmi_watchdog_default();
830 smp_commenced_mask = cpumask_of_cpu(0);
831 cpu_callin_map = cpumask_of_cpu(0); 825 cpu_callin_map = cpumask_of_cpu(0);
832 mb(); 826 mb();
833 smp_boot_cpus(max_cpus); 827 smp_boot_cpus(max_cpus);
@@ -869,8 +863,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
869 return -EIO; 863 return -EIO;
870 } 864 }
871 865
872 /* Unleash the CPU! */
873 cpu_set(cpu, smp_commenced_mask);
874 866
875 /* 867 /*
876 * Check TSC synchronization with the AP (keep irqs disabled 868 * Check TSC synchronization with the AP (keep irqs disabled