From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 7 Aug 2009 21:32:23 +0000 (+0000)
Subject: add PAE changes back in.  The boot failure I observed was due to a build
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=170b8fd76fd8e082ab3dd470f9fccc206c09b78a;p=linux-2.6.git

add PAE changes back in.  The boot failure I observed was due to a build
problem that produced a bad kernel, not a kernel config problem.
---

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index 5850d2e38..d1ea4d77c 100644
--- a/planetlab-2.6.22-i686.config
+++ b/planetlab-2.6.22-i686.config
@@ -170,6 +170,7 @@ 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
@@ -207,10 +208,11 @@ CONFIG_EFI_VARS=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 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