From 9a92c6e4303dfece9ca2793361a097124de03a9f Mon Sep 17 00:00:00 2001 From: yangsheng <yangsheng> Date: Sat, 23 Feb 2008 16:20:27 +0000 Subject: [PATCH] Branch b1_6 b=14958 i=adilger i=yangsheng Change CONFIG_NR_CPUS from 8 to 32 in a several config file. --- .../kernel_configs/kernel-2.6.15-2.6-fc5-i686-smp.config | 2 +- .../kernel_patches/kernel_configs/kernel-2.6.15-fc5-i686.config | 2 +- .../kernel_configs/kernel-2.6.16-2.6-patchless-i686-smp.config | 2 +- .../kernel_configs/kernel-2.6.16-2.6-patchless-ia64-smp.config | 2 +- .../kernel-2.6.16-2.6-patchless-x86_64-smp.config | 2 +- .../kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config | 2 +- .../kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.15-2.6-fc5-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.15-2.6-fc5-i686-smp.config index 403b3272d7..8b2043a383 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.15-2.6-fc5-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.15-2.6-fc5-i686-smp.config @@ -144,7 +144,7 @@ CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_SMP=y # CONFIG_SMP_ALTERNATIVES is not set -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.15-fc5-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.15-fc5-i686.config index 403b3272d7..8b2043a383 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.15-fc5-i686.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.15-fc5-i686.config @@ -144,7 +144,7 @@ CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_SMP=y # CONFIG_SMP_ALTERNATIVES is not set -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-i686-smp.config index 4d702b9485..86afdbbd2e 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-i686-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-i686-smp.config @@ -142,7 +142,7 @@ CONFIG_X86_TSC=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_SMP=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y 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 72f255de1a..7d8d068c67 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 @@ -117,7 +117,7 @@ CONFIG_IOSAPIC=y CONFIG_IA64_SGI_SN_XP=m CONFIG_FORCE_MAX_ZONEORDER=17 CONFIG_SMP=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 # CONFIG_HOTPLUG_CPU is not set # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT is not set diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-x86_64-smp.config index 4a0af52390..a995f65ca7 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.16-2.6-patchless-x86_64-smp.config @@ -130,7 +130,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 # CONFIG_HOTPLUG_CPU is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config index 028c475499..dc48f8650c 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config @@ -92,7 +92,7 @@ CONFIG_K8_NUMA=y CONFIG_DISCONTIGMEM=y CONFIG_NUMA=y CONFIG_HAVE_DEC_LOCK=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config index df16a733f9..51d30e0845 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config @@ -92,7 +92,7 @@ CONFIG_K8_NUMA=y CONFIG_DISCONTIGMEM=y CONFIG_NUMA=y CONFIG_HAVE_DEC_LOCK=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=32 CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y -- GitLab