Merge branch 'x86/x2apic' into x86/core

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

diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c
index 0a8128a240dfb3e83b82dfa52d43c0cbee038253..0c0a58dfe0990bb431fc9f9f77787b8d04386ad9 100644 (file)
--- a/arch/x86/kernel/cpu/intel_64.c
+++ b/arch/x86/kernel/cpu/intel_64.c
@@ -80,7 +80,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
        if (c->x86 == 6)
                set_cpu_cap(c, X86_FEATURE_REP_GOOD);
        set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
-       c->x86_max_cores = intel_num_cpu_cores(c);
+
+       detect_extended_topology(c);
+       if (!cpu_has(c, X86_FEATURE_XTOPOLOGY))
+               c->x86_max_cores = intel_num_cpu_cores(c);
 
        srat_detect_node();
 }