summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2008-08-02 13:29:24 -0500
committerTony Luck <tony.luck@intel.com>2008-08-04 11:09:51 -0700
commitd1339df1f46d10e0396c1470f371b0d1b23295ba (patch)
treeaab03b31962e5efe87b337c8c8a5a1bfba5184e2
parent94567ef16bf38e98a7de214694d327feb3ec42d4 (diff)
downloadtalos-obmc-linux-d1339df1f46d10e0396c1470f371b0d1b23295ba.tar.gz
talos-obmc-linux-d1339df1f46d10e0396c1470f371b0d1b23295ba.zip
[IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
ia64 has compiled with NR_CPUS=4096 for a couple releases, just forgot to update Kconfig to allow it. Signed-off-by: Robin Holt <holt@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 451f2ffb137b..977895893ed5 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -321,10 +321,10 @@ config SMP
If you don't know what to do here, say N.
config NR_CPUS
- int "Maximum number of CPUs (2-1024)"
- range 2 1024
+ int "Maximum number of CPUs (2-4096)"
+ range 2 4096
depends on SMP
- default "1024"
+ default "4096"
help
You should set this to the number of CPUs in your system, but
keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but
OpenPOWER on IntegriCloud