From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Thu, 6 Aug 2009 18:23:12 +0000 (+0000)
Subject: revert to 4G since this is more involved than just a config option.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c71dac11aea3e27195fa1ffe0fc2f52c365dc678;p=linux-2.6.git

revert to 4G since this is more involved than just a config option.
---

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index d1ea4d77c..5850d2e38 100644
--- a/planetlab-2.6.22-i686.config
+++ b/planetlab-2.6.22-i686.config
@@ -170,7 +170,6 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
@@ -208,11 +207,10 @@ CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 # CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-CONFIG_HIGHMEM64G=y
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-CONFIG_X86_PAE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y