From 25c97ec86f471de50556673b52d1e1b7713063af Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 4 Jul 2005 06:14:45 +0000 Subject: [PATCH] - define NOHIGHMEM for recently added highmem-split patch --- .../kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config | 8 +++++--- .../kernel_configs/kernel-2.6.10-2.6-fc3-i686.config | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config index 539b045e..4dc5060 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686-smp.config @@ -126,11 +126,13 @@ CONFIG_X86_CPUID=m # Firmware Drivers # CONFIG_EDD=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set -CONFIG_HIGHMEM=y # CONFIG_PROC_MM is not set +# CONFIG_USER_3GB is not set +# CONFIG_USER_2GB is not set +CONFIG_USER_1GB=y # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686.config index 4ff09b8..ebbb31a 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.10-2.6-fc3-i686.config @@ -126,11 +126,13 @@ CONFIG_X86_CPUID=m # Firmware Drivers # CONFIG_EDD=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set -CONFIG_HIGHMEM=y # CONFIG_PROC_MM is not set +# CONFIG_USER_3GB is not set +# CONFIG_USER_2GB is not set +CONFIG_USER_1GB=y # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y -- 1.8.3.1