Branch b1_6

Severity   : normal
Frequency  : SLES9 only
Bugzilla   : 12744
Description: Lustre patched kernel for SLES9 SP3 has NR_CPUS set to 8
Details    : set CONFIG_NR_CPUS to 128 instead of 8.

b=12744
i=scjody
i=green

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 815b232..a2e8ec7 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,12 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
        * bug fixes
 
+Severity   : normal
+Frequency  : SLES9 only
+Bugzilla   : 12744
+Description: Lustre patched kernel for SLES9 SP3 has NR_CPUS set to 8
+Details    : set CONFIG_NR_CPUS to 128 instead of 8.
+
 Severity   : enhancement
 Bugzilla   : 12678
 Description: remove fs_prep_san_write operation and related patches

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
index 81f3823..edd2e0a 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
@@ -102,7 +102,7 @@ CONFIG_K8_NUMA=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_NUMA=y
 CONFIG_HAVE_DEC_LOCK=y
-CONFIG_NR_CPUS=8
+CONFIG_NR_CPUS=128
 CONFIG_GART_IOMMU=y
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y