Skip to content

Commit

Permalink
x86: get rid of commenced mask.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 9713277 commit ddd10ec
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions arch/x86/kernel/smpboot_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
#include <asm/vmi.h>
#include <asm/mtrr.h>

static cpumask_t smp_commenced_mask;

/* which logical CPU number maps to which CPU (physical APIC ID) */
u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =
{ [0 ... NR_CPUS-1] = BAD_APICID };
Expand Down Expand Up @@ -180,8 +178,6 @@ static void __cpuinit start_secondary(void *unused)
cpu_init();
preempt_disable();
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 */
barrier();
Expand Down Expand Up @@ -667,7 +663,6 @@ void cpu_exit_clear(void)
cpu_clear(cpu, cpu_callout_map);
cpu_clear(cpu, cpu_callin_map);

cpu_clear(cpu, smp_commenced_mask);
unmap_cpu_to_logical_apicid(cpu);
}
#endif
Expand Down Expand Up @@ -827,7 +822,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
void __init native_smp_prepare_cpus(unsigned int max_cpus)
{
nmi_watchdog_default();
smp_commenced_mask = cpumask_of_cpu(0);
cpu_callin_map = cpumask_of_cpu(0);
mb();
smp_boot_cpus(max_cpus);
Expand Down Expand Up @@ -869,8 +863,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)
return -EIO;
}

/* Unleash the CPU! */
cpu_set(cpu, smp_commenced_mask);

/*
* Check TSC synchronization with the AP (keep irqs disabled
Expand Down

0 comments on commit ddd10ec

Please sign in to comment.