From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 5 Sep 2008 07:21:21 +0000 (+0200)
Subject: Merge branch 'x86/x2apic' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9042763808c5285a1a61b45b0fe98a710a4c903c;p=linux.git

Merge branch 'x86/x2apic' into x86/core

Conflicts:
	arch/x86/kernel/cpu/common_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

9042763808c5285a1a61b45b0fe98a710a4c903c
diff --cc arch/x86/kernel/cpu/common_64.c
index ae007b3521cb,a2888c7b56ac..bcb48ce05d23
--- a/arch/x86/kernel/cpu/common_64.c
+++ b/arch/x86/kernel/cpu/common_64.c
@@@ -150,8 -139,6 +150,11 @@@ void __cpuinit detect_ht(struct cpuinfo
  	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;
  
  	if (smp_num_siblings == 1) {