Merge branch 'x86/ptrace' into x86/tsc

Conflicts: arch/x86/kernel/cpu/intel.c
2008-12-23 16:29:31 +01:00
parent 345077cd98 f4166c54bf
commit 7e3cbc3f77
3 changed files with 9 additions and 12 deletions
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -324,12 +324,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 		set_cpu_cap(c, X86_FEATURE_P4);
 	if (c->x86 == 6)
 		set_cpu_cap(c, X86_FEATURE_P3);
+#endif

 	if (cpu_has_bts)
 		ptrace_bts_init_intel(c);

-#endif
-
 	if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
 		/*
 		 * let's use the legacy cpuid vector 0x1 and 0x4 for topology