x86/cpu: Encapsulate topology information in cpuinfo_x86

[linux-2.6-microblaze.git] / arch / x86 / kernel / cpu / mce / core.c

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 6f35f72..b5e9288 100644 (file)
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -124,7 +124,7 @@ void mce_setup(struct mce *m)
        m->cpuvendor = boot_cpu_data.x86_vendor;
        m->cpuid = cpuid_eax(1);
        m->socketid = cpu_data(m->extcpu).phys_proc_id;
-       m->apicid = cpu_data(m->extcpu).initial_apicid;
+       m->apicid = cpu_data(m->extcpu).topo.initial_apicid;
        m->mcgcap = __rdmsr(MSR_IA32_MCG_CAP);
        m->ppin = cpu_data(m->extcpu).ppin;
        m->microcode = boot_cpu_data.microcode;