diff options
| author | travis@sgi.com | 2008-01-30 13:33:12 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:33:12 +0100 |
| commit | e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4 (patch) | |
| tree | 528635634911cc977325b746aa149a55b402b2bf /arch/x86/kernel/mpparse_64.c | |
| parent | x86: change NR_CPUS arrays in acpi-cpufreq (diff) | |
| download | kernel-qcow2-linux-e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4.tar.gz kernel-qcow2-linux-e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4.tar.xz kernel-qcow2-linux-e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4.zip | |
x86: change bios_cpu_apicid to percpu data variable
Change static bios_cpu_apicid array to a per_cpu data variable.
This includes using a static array used during initialization
similar to the way x86_cpu_to_apicid[] is handled.
There is one early use of bios_cpu_apicid in apic_is_clustered_box().
The other reference in cpu_present_to_apicid() is called after
smp_set_apicids() has setup the percpu version of bios_cpu_apicid.
[ mingo@elte.hu: build fix ]
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/mpparse_64.c')
| -rw-r--r-- | arch/x86/kernel/mpparse_64.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 528ad9696d96..fd671754dcb5 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c @@ -67,7 +67,11 @@ unsigned disabled_cpus __cpuinitdata; /* Bitmask of physically existing CPUs */ physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE; -u16 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID }; +u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata + = { [0 ... NR_CPUS-1] = BAD_APICID }; +void *x86_bios_cpu_apicid_early_ptr; +DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID; +EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid); /* @@ -118,19 +122,22 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) physid_set(m->mpc_apicid, phys_cpu_present_map); if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { /* - * bios_cpu_apicid is required to have processors listed + * x86_bios_cpu_apicid is required to have processors listed * in same order as logical cpu numbers. Hence the first * entry is BSP, and so on. */ cpu = 0; } - bios_cpu_apicid[cpu] = m->mpc_apicid; /* are we being called early in kernel startup? */ if (x86_cpu_to_apicid_early_ptr) { - u16 *x86_cpu_to_apicid = (u16 *)x86_cpu_to_apicid_early_ptr; - x86_cpu_to_apicid[cpu] = m->mpc_apicid; + u16 *cpu_to_apicid = (u16 *)x86_cpu_to_apicid_early_ptr; + u16 *bios_cpu_apicid = (u16 *)x86_bios_cpu_apicid_early_ptr; + + cpu_to_apicid[cpu] = m->mpc_apicid; + bios_cpu_apicid[cpu] = m->mpc_apicid; } else { per_cpu(x86_cpu_to_apicid, cpu) = m->mpc_apicid; + per_cpu(x86_bios_cpu_apicid, cpu) = m->mpc_apicid; } cpu_set(cpu, cpu_possible_map); |