rpms/kernel/F-8 kernel.spec, 1.386, 1.387 linux-2.6-x86-dont-use-p6-nops.patch, 1.1, 1.2

Chuck Ebbert (cebbert) fedora-extras-commits at redhat.com
Tue Mar 18 15:20:27 UTC 2008


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32277

Modified Files:
	kernel.spec linux-2.6-x86-dont-use-p6-nops.patch 
Log Message:
* Tue Mar 18 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-41
- Make the i686 kernel work on compatible processors, take 2. (#435609)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- kernel.spec	17 Mar 2008 20:33:48 -0000	1.386
+++ kernel.spec	18 Mar 2008 15:19:36 -0000	1.387
@@ -1917,6 +1917,9 @@
 
 
 %changelog
+* Tue Mar 18 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-41
+- Make the i686 kernel work on compatible processors, take 2. (#435609)
+
 * Mon Mar 17 2008 Jarod Wilson <jwilson at redhat.com> 2.6.24.3-40
 - Actually add the coherent DMA fix that was supposed to be added in -37.
 

linux-2.6-x86-dont-use-p6-nops.patch:

Index: linux-2.6-x86-dont-use-p6-nops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-x86-dont-use-p6-nops.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-dont-use-p6-nops.patch	3 Mar 2008 22:05:39 -0000	1.1
+++ linux-2.6-x86-dont-use-p6-nops.patch	18 Mar 2008 15:19:36 -0000	1.2
@@ -25,12 +25,15 @@
 
 --- linux-2.6.24.noarch.orig/include/asm-x86/processor_32.h
 +++ linux-2.6.24.noarch/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




More information about the fedora-extras-commits mailing list