Merge branch 'x86/tsc' into tracing/core

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

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

diff --cc arch/x86/kernel/cpu/intel.c
index cd413d9a021801e821acf68f4085bdaf3e61f935,ccfd2047630c81530c6a183183835ac6fd796f87..8ea6929e974c090142ed0d3744167792ce04d777
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -308,7 -326,9 +325,6 @@@ static void __cpuinit init_intel(struc
                set_cpu_cap(c, X86_FEATURE_P3);
  #endif
  
-       detect_extended_topology(c);
 -      if (cpu_has_bts)
 -              ptrace_bts_init_intel(c);
 -
        if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
                /*
                 * let's use the legacy cpuid vector 0x1 and 0x4 for topology

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