SPECS (LINUX_2_6): kernel.spec - disable HIGHMEM64GB on anything b...

[baggins]

Author: baggins                      Date: Wed Apr 19 15:08:24 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- disable HIGHMEM64GB on anything below i686

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1496 -> 1.441.2.1497) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1496 SPECS/kernel.spec:1.441.2.1497
--- SPECS/kernel.spec:1.441.2.1496	Wed Apr 19 16:40:26 2006
+++ SPECS/kernel.spec	Wed Apr 19 17:08:18 2006
@@ -790,14 +790,9 @@
     %ifarch athlon
 	sed -i 's:# CONFIG_MK7 is not set:CONFIG_MK7=y:' $1
     %endif
-    %ifarch pentium3 pentium4 athlon
-#	kernel-i386-smp.config contains 64G support by default.
-	%if %{with up}
-	    sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
-	    sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
-	%endif
-    %endif
-    %ifarch i686 pentium3 pentium4 athlon
+    %ifarch i686 athlon pentium3 pentium4
+	sed -i "s:CONFIG_HIGHMEM4G=y:# CONFIG_HIGHMEM4G is not set:" $1
+	sed -i "s:# CONFIG_HIGHMEM64G is not set:CONFIG_HIGHMEM64G=y\nCONFIG_X86_PAE=y:" $1
 	sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
     %endif
     %if %{with regparm}
@@ -1594,6 +1589,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1497  2006/04/19 15:08:18  baggins
+- disable HIGHMEM64GB on anything below i686
+
 Revision 1.441.2.1496  2006/04/19 14:40:26  baggins
 - athlon does not need math emulation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1496&r2=1.441.2.1497&f=u