Merge branch 'x86/x2apic' into x86/core

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

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

diff --cc arch/x86/kernel/cpu/common_64.c
index ae007b3521cb0961e963eea9e317bc0be663d504,a2888c7b56accc168ebcd006f23152d37d447688..bcb48ce05d23e261a1d996303437a2d3fb042b7e
--- 1/arch/x86/kernel/cpu/common_64.c
--- 2/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) {

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel_64.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_cluster.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_phys.c
Simple merge

diff --cc include/asm-x86/cpufeature.h
Simple merge

diff --cc include/asm-x86/processor.h
Simple merge