Merge branch 'x86/ptrace' into x86/tsc

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

diff --cc arch/x86/kernel/cpu/intel.c
index b21c37c,816f27f..ccfd204
--- 1/arch/x86/kernel/cpu/intel.c
--- 2/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@@ -328,8 -312,7 +329,6 @@@ static void __cpuinit init_intel(struc
        if (cpu_has_bts)
                ptrace_bts_init_intel(c);
  
- #endif
- 
 -      detect_extended_topology(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/ds.c
Simple merge