From 8aeb668ced22bebf3a980fcbe0d4d6b64164acbb Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Fri, 7 Aug 2009 21:32:23 +0000 Subject: [PATCH] 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. --- planetlab-2.6.22-i686.config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config index ee40a6735..1266cb83f 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 -- 2.47.0