x86: require family >= 6 if we are using P6 NOPs

[linux-2.6-omap-h63xx.git] / include / asm-x86 / nops.h

diff --git a/include/asm-x86/nops.h b/include/asm-x86/nops.h
index fec025c7f58cf0b375f94dc4335ca39fdf113125..c52b334b8166e5f2faeba5f2a5a585dc574e5775 100644 (file)
--- a/include/asm-x86/nops.h
+++ b/include/asm-x86/nops.h
@@ -63,9 +63,7 @@
 #define ASM_NOP6 K7_NOP6
 #define ASM_NOP7 K7_NOP7
 #define ASM_NOP8 K7_NOP8
-#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \
-      defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUMM) || \
-      defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4)
+#elif defined(CONFIG_X86_P6_NOP)
 #define ASM_NOP1 P6_NOP1
 #define ASM_NOP2 P6_NOP2
 #define ASM_NOP3 P6_NOP3