Merge branch 'x86/ptrace' into x86/tsc
[linux-2.6.git] / arch / x86 / kernel / cpu / intel.c
index b21c37c060a243a78c62bf71f6932ada79d64cb4..ccfd2047630c81530c6a183183835ac6fd796f87 100644 (file)
@@ -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