update x86-don-t-use-p6_nops-if-compiling-with-config_x86_generic.patch to use proper...

diff --git a/queue-2.6.24/x86-don-t-use-p6_nops-if-compiling-with-config_x86_generic.patch b/queue-2.6.24/x86-don-t-use-p6_nops-if-compiling-with-config_x86_generic.patch
index 747806cf2505f49db55862833d567e369c42d3c5..1284bb5c9e7731ed3d7b4830b35b9d6820d889a8 100644 (file)
--- a/queue-2.6.24/x86-don-t-use-p6_nops-if-compiling-with-config_x86_generic.patch
+++ b/queue-2.6.24/x86-don-t-use-p6_nops-if-compiling-with-config_x86_generic.patch
@@ -1,6 +1,6 @@
-From stable-bounces@linux.kernel.org  Wed Mar 12 15:05:15 2008
-Message-ID: <47CF31CE.5020106@redhat.com>
-Date: Wed, 05 Mar 2008 18:50:38 -0500
+From stable-bounces@linux.kernel.org  Tue Mar 18 16:39:54 2008
+Message-ID: <47E04EDB.3060603@redhat.com>
+Date: Tue, 18 Mar 2008 19:23:07 -0400
 From: Chuck Ebbert <cebbert@redhat.com>
 To: linux-stable <stable@kernel.org>
 Cc: "H. Peter Anvin" <hpa@zytor.com>
@@ -21,21 +21,24 @@ building for generic consumption, avoid using them.
 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>
-[cebbert@redhat.com: backport to 2.6.24]
+[cebbert@redhat.com: backport take 2, with parens this time]
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 ---
 
- include/asm-x86/processor_32.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ include/asm-x86/processor_32.h |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 --- a/include/asm-x86/processor_32.h
 +++ b/include/asm-x86/processor_32.h
-@@ -714,7 +714,8 @@ static inline unsigned int cpuid_edx(uns
+@@ -712,9 +712,10 @@ static inline unsigned int cpuid_edx(uns
+ #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) || \
++#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_MCORE2) || defined(CONFIG_PENTIUM4)) && \
 +      !defined(CONFIG_X86_GENERIC)
  #define ASM_NOP1 P6_NOP1
  #define ASM_NOP2 P6_NOP2