Merge branch 'x86/x2apic' into x86/core

[pandora-kernel.git] / arch / x86 / kernel / cpu / common_64.c

diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
index ae007b3..bcb48ce 100644 (file)
--- a/arch/x86/kernel/cpu/common_64.c
+++ b/arch/x86/kernel/cpu/common_64.c
@@ -150,6 +150,9 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c)
        if (cpu_has(c, X86_FEATURE_CMP_LEGACY))
                goto out;
 
+       if (cpu_has(c, X86_FEATURE_XTOPOLOGY))
+               return;
+
        cpuid(1, &eax, &ebx, &ecx, &edx);
 
        smp_num_siblings = (ebx & 0xff0000) >> 16;