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 403b3272d7b30d6113f884a00910d6c5fbde55ca..8b2043a383ae5179981fd02fc02727ec4ca8c96d 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 403b3272d7b30d6113f884a00910d6c5fbde55ca..8b2043a383ae5179981fd02fc02727ec4ca8c96d 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 4d702b9485f625874481d346c6215beb1ca7068a..86afdbbd2ee589627573b2c6fcf8ddf7033ce59f 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 72f255de1ae9d11fce782e3bb42ab30cbd8ead37..7d8d068c67516a843ac166d7d4a0ed044076f70d 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 4a0af5239061128e2f05938090d6bf414b43139f..a995f65ca7cb54496d088682833126261a1f477a 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 028c475499dc217c7dfd6b5e6af9485ba01224a3..dc48f8650c012df795358ed6495ecc5e14f63146 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 df16a733f9fe58d2528217990db5a272f8c748bd..51d30e084585dd55be860cc398a5b7758169bcfd 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