[kernel] Change maximum CPU support for x86-64.

[Dave Jones]

commit d283b6f1bb095ba52e957dc155a51e2097d8c5ca
Author: Dave Jones <davej at redhat.com>
Date:   Tue Jan 17 14:33:12 2012 -0500

    Change maximum CPU support for x86-64.
    
    Rawhide builds now use MAXSMP on x86.
    For release builds, set x86-64 to support 64 CPUs.
    If larger systems become widespread, we can increase in an update.

 Makefile              |    2 +-
 Makefile.release      |    3 ++-
 config-x86-generic    |    2 +-
 config-x86_64-generic |    2 +-
 kernel.spec           |    7 ++++++-
 5 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/Makefile b/Makefile
index 933eb32..c1e1ab9 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ debug:
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
-	@perl -pi -e 's/CONFIG_NR_CPUS=256/CONFIG_NR_CPUS=512/' config-x86_64-generic
+	@perl -pi -e 's/# CONFIG_MAXSMP is not set/CONFIG_MAXSMP=y/' config-x86-generic
 
 	# Try out UAS in rawhide builds.
 	@perl -pi -e 's/# CONFIG_USB_UAS is not set/CONFIG_USB_UAS=m/' config-generic
diff --git a/Makefile.release b/Makefile.release
index f911ec6..2ef19fe 100644
--- a/Makefile.release
+++ b/Makefile.release
@@ -75,6 +75,7 @@ config-release:
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
 
 	# Change defaults back to sane things.
-	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=256/' config-x86_64-generic
+	@perl -pi -e 's/CONFIG_MAXSMP=y/# CONFIG_MAXSMP is not set/' config-x86-generic
+
 	# Disable UAS for release until it's ready.
 	@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
diff --git a/config-x86-generic b/config-x86-generic
index 230c788..3b10fb8 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -307,7 +307,7 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_NO_BOOTMEM is not set
 
 # CONFIG_MEMTEST is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
 
 
 CONFIG_HP_ILO=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 586b010..344a393 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -12,7 +12,7 @@ CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
 
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=64
 CONFIG_PHYSICAL_START=0x1000000
 
 CONFIG_IA32_EMULATION=y
diff --git a/kernel.spec b/kernel.spec
index 263bf8a..1da1450 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 5
+%global baserelease 6
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2322,6 +2322,11 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 17 2012 Dave Jones <davej at redhat.com>
+- Rawhide builds now use MAXSMP on x86.
+- For release builds, set x86-64 to support 64 CPUs.
+  If larger systems become widespread, we can increase in an update.
+
 * Tue Jan 17 2012 Dave Jones <davej at redhat.com> 3.2.1-5
 - Give KMEMLEAK a try again.