From 90e4d1f5a1ba190d1d55ccba54f55e0043dcc4c9 Mon Sep 17 00:00:00 2001 From: brian Date: Tue, 11 Jul 2006 23:44:28 +0000 Subject: [PATCH] See if this makes lester any happier. Is more in line with what RHEL4 does anyway. --- .../kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config | 6 +++--- .../kernel_configs/kernel-2.6.16-2.6-patchless-ia64.config | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config index 6da1417..3442b1c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config @@ -122,10 +122,10 @@ CONFIG_NR_CPUS=8 # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT is not set CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64.config index 6e0623f..5e0c510 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-ia64.config @@ -117,10 +117,10 @@ CONFIG_FORCE_MAX_ZONEORDER=17 # CONFIG_SMP is not set # CONFIG_PREEMPT is not set CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set -- 1.8.3.1