SOURCES (LINUX_2_6): kernel-i386-smp.config - disable HIGHMEM64GB ...

baggins baggins at pld-linux.org
Wed Apr 19 17:08:43 CEST 2006


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

---- Files affected:
SOURCES:
   kernel-i386-smp.config (1.59.10.126 -> 1.59.10.127) 

---- Diffs:

================================================================
Index: SOURCES/kernel-i386-smp.config
diff -u SOURCES/kernel-i386-smp.config:1.59.10.126 SOURCES/kernel-i386-smp.config:1.59.10.127
--- SOURCES/kernel-i386-smp.config:1.59.10.126	Sun Apr  9 13:01:55 2006
+++ SOURCES/kernel-i386-smp.config	Wed Apr 19 17:08:38 2006
@@ -127,8 +127,8 @@
 # CONFIG_EDD is not set
 CONFIG_EFI_VARS=m 
 # CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -136,7 +136,6 @@
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_X86_PAE=y
 # CONFIG_HIGHPTE is not set
 CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.126&r2=1.59.10.127&f=u



More information about the pld-cvs-commit mailing list