1 files changed, 10 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index c5ac08124adc..959417b8cd64 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -176,9 +176,16 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
         if (p)
                 strcpy(c->x86_model_id, p);
 
-        c->x86_max_cores = num_cpu_cores(c);
-
-        detect_ht(c);
+        detect_extended_topology(c);
+
+        if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
+                /*
+                 * let's use the legacy cpuid vector 0x1 and 0x4 for topology
+                 * detection.
+                 */
+                c->x86_max_cores = num_cpu_cores(c);
+                detect_ht(c);
+        }
 
         /* Work around errata */
         Intel_errata_workarounds(c);