From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 23 Dec 2008 15:29:31 +0000 (+0100)
Subject: Merge branch 'x86/ptrace' into x86/tsc
X-Git-Tag: v2.6.29-rc1~586^2~1^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e3cbc3f774f31ecd88a51edae3d9377f60a4c00;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/ptrace' into x86/tsc

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

7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
diff --cc arch/x86/kernel/cpu/intel.c
index b21c37c060a,816f27f289b..ccfd2047630
--- a/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