diff options
| author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 23:42:15 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:35 +0200 |
| commit | 746f2244065ddfbe0c5d339e309db4d2b48f185b (patch) | |
| tree | 1e44cdefca464e981421dfc6e2e2f261a9302215 /arch/x86/kernel/mpparse_64.c | |
| parent | 888032cd23f0244fdefdcbe265952e7831a9cacc (diff) | |
x86: unify arch/x86/kernel/mpparse_64.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/mpparse_64.c')
| -rw-r--r-- | arch/x86/kernel/mpparse_64.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 1c3bf80b3ba..5c916383bb7 100644 --- a/arch/x86/kernel/mpparse_64.c +++ b/arch/x86/kernel/mpparse_64.c @@ -65,19 +65,25 @@ static int __init mpf_checksum(unsigned char *mp, int len) static void __cpuinit MP_processor_info(struct mpc_config_processor *m) { + int apicid; char *bootup_cpu = ""; if (!(m->mpc_cpuflag & CPU_ENABLED)) { disabled_cpus++; return; } +#ifdef CONFIG_X86_NUMAQ + apicid = mpc_apic_id(m, translation_table[mpc_record]); +#else + apicid = m->mpc_apicid; +#endif if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { bootup_cpu = " (Bootup-CPU)"; boot_cpu_physical_apicid = m->mpc_apicid; } printk(KERN_INFO "Processor #%d%s\n", m->mpc_apicid, bootup_cpu); - generic_processor_info(m->mpc_apicid, 0); + generic_processor_info(apicid, m->mpc_apicver); } static void __init MP_bus_info(struct mpc_config_bus *m) |