From f2ba5924cc678c418b449bb69bb08af82325cb5e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 May 2008 04:39:44 +0000 Subject: [PATCH] Change from CONFIG_HIGHMEM64G to CONFIG_HIGHMEM4G for bug #220058. svn path=/trunk/; revision=526 --- releases/2008.0/ChangeLog | 4 ++++ releases/2008.0/kconfig/x86/livecd-2.6.24.config | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog index 31c96b0d..a933859b 100644 --- a/releases/2008.0/ChangeLog +++ b/releases/2008.0/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 May 2008; Chris Gianelloni + kconfig/x86/livecd-2.6.24.config: + Change from CONFIG_HIGHMEM64G to CONFIG_HIGHMEM4G for bug #220058. + 09 May 2008; Chris Gianelloni kconfig/x86/livecd-2.6.24.config, kconfig/x86/installcd-2.6.24.config: Added the PATA drivers to our kernel config for x86. diff --git a/releases/2008.0/kconfig/x86/livecd-2.6.24.config b/releases/2008.0/kconfig/x86/livecd-2.6.24.config index 200f54f5..5f8c2ad5 100644 --- a/releases/2008.0/kconfig/x86/livecd-2.6.24.config +++ b/releases/2008.0/kconfig/x86/livecd-2.6.24.config @@ -223,16 +223,15 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y -# CONFIG_VMSPLIT_3G is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_2G_OPT is not set # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y