kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: get rid of commenced mask.

Browse source 
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>
This commit is contained in:
Glauber de Oliveira Costa 2008-03-19 14:25:44 -03:00 committed by Ingo Molnar
parent 9713277607
commit ddd10ecfa2
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/kernel/smpboot_32.c
View file

@ -59,8 +59,6 @@
#include <asm/vmi.h> #include <asm/vmi.h>
#include <asm/mtrr.h> #include <asm/mtrr.h>
static cpumask_t smp_commenced_mask;
/* which logical CPU number maps to which CPU (physical APIC ID) */ /* which logical CPU number maps to which CPU (physical APIC ID) */
u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata = u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
{ [0 ... NR_CPUS-1] = BAD_APICID }; { [0 ... NR_CPUS-1] = BAD_APICID };
@ -180,8 +178,6 @@ static void __cpuinit start_secondary(void *unused)
cpu_init(); cpu_init();
preempt_disable(); preempt_disable();
smp_callin(); smp_callin();
while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
cpu_relax();
/* otherwise gcc will move up smp_processor_id before the cpu_init */ /* otherwise gcc will move up smp_processor_id before the cpu_init */
barrier(); barrier();
@ -667,7 +663,6 @@ void cpu_exit_clear(void)
cpu_clear(cpu, cpu_callout_map); cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map); cpu_clear(cpu, cpu_callin_map);
cpu_clear(cpu, smp_commenced_mask);
unmap_cpu_to_logical_apicid(cpu); unmap_cpu_to_logical_apicid(cpu);
} }
#endif #endif
@ -827,7 +822,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
void __init native_smp_prepare_cpus(unsigned int max_cpus) void __init native_smp_prepare_cpus(unsigned int max_cpus)
{ {
nmi_watchdog_default(); nmi_watchdog_default();
smp_commenced_mask = cpumask_of_cpu(0);
cpu_callin_map = cpumask_of_cpu(0); cpu_callin_map = cpumask_of_cpu(0);
mb(); mb();
smp_boot_cpus(max_cpus); smp_boot_cpus(max_cpus);
@ -869,8 +863,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
return -EIO; return -EIO;
} }
/* Unleash the CPU! */
cpu_set(cpu, smp_commenced_mask);
/* /*
* Check TSC synchronization with the AP (keep irqs disabled * Check TSC synchronization with the AP (keep irqs disabled