diff options
| author | H. Peter Anvin | 2008-02-14 23:52:05 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-02-26 12:55:51 +0100 |
| commit | 7343b3b3a627eb30e24e921f004f659c8ebb91c5 (patch) | |
| tree | 1e7c77a864c4a3e0186f9192a71520d0d39edf73 /include | |
| parent | x86: do not promote TM3x00/TM5x00 to i686-class (diff) | |
| download | kernel-qcow2-linux-7343b3b3a627eb30e24e921f004f659c8ebb91c5.tar.gz kernel-qcow2-linux-7343b3b3a627eb30e24e921f004f659c8ebb91c5.tar.xz kernel-qcow2-linux-7343b3b3a627eb30e24e921f004f659c8ebb91c5.zip | |
x86: require family >= 6 if we are using P6 NOPs
The P6 family of NOPs are only available on family >= 6 or above, so
enforce that in the boot code.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/nops.h | 4 |
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 @@ #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 |