summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-09-23 22:30:56 -0400
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-09-23 22:30:56 -0400
commit2e2bb0af9071d7fd530f8c34a3843728928268df (patch)
tree55ee9488533b2180f99f21248bd8712613888dbe
parent121bfe2c6a61630a4c03891824204e28ebdd235f (diff)
downloadkernel-2e2bb0af9071d7fd530f8c34a3843728928268df.tar.gz
kernel-2e2bb0af9071d7fd530f8c34a3843728928268df.tar.xz
kernel-2e2bb0af9071d7fd530f8c34a3843728928268df.zip
Bump x86 NR_CPUS to 64. (Still 512/256 on x86_64.)
-rw-r--r--config-x86-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 9b80da7ff..ba3993563 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -37,7 +37,7 @@ CONFIG_M686=y
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
CONFIG_SMP=y
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=64
CONFIG_X86_GENERIC=y
# CONFIG_X86_PPRO_FENCE is not set
CONFIG_HPET=y
diff --git a/kernel.spec b/kernel.spec
index 692d23344..89fc461bb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1930,6 +1930,9 @@ fi
# || ||
%changelog
+* Thu Sep 23 2010 Kyle McMartin <kyle@redhat.com>
+- Bump x86 NR_CPUS to 64. (Still 512/256 on x86_64.)
+
* Thu Sep 23 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36-0.26.rc5.git4
- Linux 2.6.36-rc5-git4
- Drop merged patches: