From: yangsheng <yangsheng>
Date: Sat, 23 Feb 2008 16:20:27 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~740
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9a92c6e4303dfece9ca2793361a097124de03a9f;p=fs%2Flustre-release.git

Branch b1_6
b=14958
i=adilger
i=yangsheng

Change CONFIG_NR_CPUS from 8 to 32 in a several config file.
---

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 403b327..8b2043a 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 403b327..8b2043a 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 4d702b9..86afdbb 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 72f255d..7d8d068 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 4a0af52..a995f65 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 028c475..dc48f86 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 df16a73..51d30e0 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