Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / cpu / addon_cpuid_features.c

diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index ef8f831af823a89530297919585e50c9a691e804..2cf23634b6d94d60e239d3f63cd9d4d21526b3fd 100644 (file)
--- a/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -120,9 +120,17 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
        c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width)
                                                 & core_select_mask;
        c->phys_proc_id = phys_pkg_id(c->initial_apicid, core_plus_mask_width);
+       /*
+        * Reinit the apicid, now that we have extended initial_apicid.
+        */
+       c->apicid = phys_pkg_id(c->initial_apicid, 0);
 #else
        c->cpu_core_id = phys_pkg_id(ht_mask_width) & core_select_mask;
        c->phys_proc_id = phys_pkg_id(core_plus_mask_width);
+       /*
+        * Reinit the apicid, now that we have extended initial_apicid.
+        */
+       c->apicid = phys_pkg_id(0);
 #endif
        c->x86_max_cores = (core_level_siblings / smp_num_siblings);