From: Ingo Molnar Date: Thu, 25 Dec 2008 11:48:18 +0000 (+0100) Subject: Merge branch 'x86/tsc' into tracing/core X-Git-Tag: v2.6.29-rc1~586^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5;p=linux-2.6-omap-h63xx.git 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 --- a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5 diff --cc arch/x86/kernel/cpu/intel.c index cd413d9a021,ccfd2047630..8ea6929e974 --- a/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