rpms/kernel/devel kernel-2.6.spec, 1.3225, 1.3226 linux-2.6-x86-tune-generic.patch, 1.1, 1.2

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086

Modified Files:
	kernel-2.6.spec linux-2.6-x86-tune-generic.patch 
Log Message:
* Sun Jun 17 2007 Dave Jones <davej at redhat.com>
- Make the 686 kernel bootable on 586s.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3225
retrieving revision 1.3226
diff -u -r1.3225 -r1.3226
--- kernel-2.6.spec	17 Jun 2007 19:45:32 -0000	1.3225
+++ kernel-2.6.spec	18 Jun 2007 02:55:52 -0000	1.3226
@@ -134,14 +134,7 @@
 %define with_kdump 0
 %endif
 
-# if building for RHEL
-%if 0%{?rhel}
-# don't build i586 RHEL kernels
 %define all_x86 i386 i686
-# if building for Fedora
-%else
-%define all_x86 i386 i586 i686
-%endif
 
 # Overrides for generic default options
 
@@ -178,7 +171,7 @@
 
 # no need to build headers again for these arches,
 # they can just use i386 and ppc64 headers
-%ifarch i586 i686 ppc64iseries
+%ifarch i686 ppc64iseries
 %define with_headers 0
 %endif
 
@@ -337,7 +330,7 @@
 Version: %{rpmversion}
 Release: %{release}
 %if 0%{?olpc}
-ExclusiveArch: i386 i586
+ExclusiveArch: i386
 %else
 # DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %nobuildarches (ABOVE) INSTEAD
@@ -848,7 +841,7 @@
     $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
     rm $i.tmp
   done
-  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
+  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i686,i686-PAE,x86_64}*.config
   do
     echo i is this file  $i
     mv $i $i.tmp
@@ -2084,6 +2077,9 @@
 
 %changelog
 * Sun Jun 17 2007 Dave Jones <davej at redhat.com>
+- Make the 686 kernel bootable on 586s.
+
+* Sun Jun 17 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-rc5.
 
 * Sun Jun 17 2007 Dave Jones <davej at redhat.com>

linux-2.6-x86-tune-generic.patch:

Index: linux-2.6-x86-tune-generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tune-generic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-tune-generic.patch	26 Mar 2006 00:13:38 -0000	1.1
+++ linux-2.6-x86-tune-generic.patch	18 Jun 2007 02:55:52 -0000	1.2
@@ -1,11 +1,16 @@
---- linux-2.6.15/arch/i386/Makefile.cpu~	2006-01-09 11:39:04.000000000 -0500
-+++ linux-2.6.15/arch/i386/Makefile.cpu	2006-01-09 11:39:36.000000000 -0500
+
+* Don't use 686 instructions like cmov
+  This allows us to boot on 586's without needing a separate kernel.
+* Optimise for today's CPUs.
+
+--- linux-2.6/arch/i386/Makefile.cpu~	2006-01-09 11:39:04.000000000 -0500
++++ linux-2.6/arch/i386/Makefile.cpu	2006-01-09 11:39:36.000000000 -0500
 @@ -15,7 +15,7 @@ cflags-$(CONFIG_M486)		+= -march=i486
  cflags-$(CONFIG_M586)		+= -march=i586
  cflags-$(CONFIG_M586TSC)	+= -march=i586
  cflags-$(CONFIG_M586MMX)	+= -march=pentium-mmx
 -cflags-$(CONFIG_M686)		+= -march=i686
-+cflags-$(CONFIG_M686)		+= -march=i686 $(call tune,generic)
++cflags-$(CONFIG_M686)		+= -march=i586 $(call tune,generic)
  cflags-$(CONFIG_MPENTIUMII)	+= -march=i686 $(call tune,pentium2)
  cflags-$(CONFIG_MPENTIUMIII)	+= -march=i686 $(call tune,pentium3)
  cflags-$(CONFIG_MPENTIUMM)	+= -march=i686 $(call tune,pentium3)