aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/nops.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/nops.h b/include/asm-x86/nops.h
index fec025c7f58c..c52b334b8166 100644
--- a/include/asm-x86/nops.h
+++ b/include/asm-x86/nops.h
@@ -63,9 +63,7 @@
63#define ASM_NOP6 K7_NOP6 63#define ASM_NOP6 K7_NOP6
64#define ASM_NOP7 K7_NOP7 64#define ASM_NOP7 K7_NOP7
65#define ASM_NOP8 K7_NOP8 65#define ASM_NOP8 K7_NOP8
66#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \ 66#elif defined(CONFIG_X86_P6_NOP)
67 defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUMM) || \
68 defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4)
69#define ASM_NOP1 P6_NOP1 67#define ASM_NOP1 P6_NOP1
70#define ASM_NOP2 P6_NOP2 68#define ASM_NOP2 P6_NOP2
71#define ASM_NOP3 P6_NOP3 69#define ASM_NOP3 P6_NOP3