From a71fad255d2ab627ad9f16caf3681aaba84c2510 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Tue, 18 Mar 2008 19:23:07 -0400 Subject: [PATCH] x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC Commit: 959b3be64cab9160cd74532a49b89cdd918d38e9 x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC P6_NOPs are definitely not supported on some VIA CPUs, and possibly (unverified) on AMD K7s. It is also the only thing that prevents a 686 kernel from running on Transmeta TM3x00/5x00 (Crusoe) series. The performance benefit over generic NOPs is very small, so when building for generic consumption, avoid using them. Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner [cebbert@redhat.com: backport take 2, with parens this time] Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- include/asm-x86/processor_32.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h index 13976b086837..787ee2e7dead 100644 --- a/include/asm-x86/processor_32.h +++ b/include/asm-x86/processor_32.h @@ -712,9 +712,10 @@ static inline unsigned int cpuid_edx(unsigned int op) #define ASM_NOP6 K7_NOP6 #define ASM_NOP7 K7_NOP7 #define ASM_NOP8 K7_NOP8 -#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \ +#elif (defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \ defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUMM) || \ - defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4) + defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4)) && \ + !defined(CONFIG_X86_GENERIC) #define ASM_NOP1 P6_NOP1 #define ASM_NOP2 P6_NOP2 #define ASM_NOP3 P6_NOP3 -- 2.39.5