rpms/kernel/F-8 linux-2.6-x86-dont-use-p6-nops.patch, NONE, 1.1 kernel.spec, 1.359, 1.360

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-dont-use-p6-nops.patch 
Log Message:
* Mon Mar 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-14
- Allow i686 kernel to boot on Via C3/C7 processors (#435609)


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

--- NEW FILE linux-2.6-x86-dont-use-p6-nops.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=959b3be64cab9160cd74532a49b89cdd918d38e9
Commit:     959b3be64cab9160cd74532a49b89cdd918d38e9
Parent:     7343b3b3a627eb30e24e921f004f659c8ebb91c5
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Thu Feb 14 14:56:45 2008 -0800
Committer:  Ingo Molnar <mingo at elte.hu>
CommitDate: Tue Feb 26 12:55:51 2008 +0100

    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 <hpa at zytor.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    [cebbert at redhat.com: backport]
---
 include/asm-x86/processor_32.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- 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
 #define ASM_NOP8 K7_NOP8
 #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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- kernel.spec	28 Feb 2008 03:18:34 -0000	1.359
+++ kernel.spec	3 Mar 2008 22:05:39 -0000	1.360
@@ -587,6 +587,7 @@
 # Patch61: linux-2.6-x86-setup-add-near-jump.patch
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
+Patch76: linux-2.6-x86-dont-use-p6-nops.patch
 
 Patch86: linux-2.6-alsa-support-sis7019.patch
 Patch87: linux-2.6-alsa-hda-stac-dmic.patch
@@ -1057,14 +1058,12 @@
 # x86(-64)
 # Compile 686 kernels tuned for Pentium4.
 ApplyPatch linux-2.6-x86-tune-generic.patch
-# x86: fix boot on 486
-# ApplyPatch linux-2.6-x86-setup-add-near-jump.patch
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
-# fix x86 tsc clock calibration
 # debug early boot
 #ApplyPatch linux-2.6-x86-debug-boot.patch
-# shorter i386 oops reports (scheduled for 2.6.24)
+# allow i686 kernel to boot on non-mainstream processors
+ApplyPatch linux-2.6-x86-dont-use-p6-nops.patch
 
 #
 # PowerPC
@@ -1914,6 +1913,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-14
+- Allow i686 kernel to boot on Via C3/C7 processors (#435609)
+
 * Wed Feb 27 2008 John W. Linville <linville at redhat.com> 2.6.24.3-13
 - rt2x00: correct address calc for queue private data
 - mac80211: better definition of mactime