UBUNTU: [Config] Set CONFIG_NR_CPUS=256 for amd64 generic

BugLink: http://bugs.launchpad.net/bugs/737124

SRU Justification

Impact: Workstations with greater than 64 cores cannot boot.

        See: http://bugs.launchpad.net/bugs/706058 for information
	about memory impact.

Signed-off-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index 58adfb5..a3d1808 100644 (file)
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -6,7 +6,7 @@ CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_INTEL_IDLE=y
 # CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=256
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_SCSI_SPI_ATTRS=m