aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-28 11:16:06 -0700
committerTony Luck <tony.luck@intel.com>2005-10-28 11:16:06 -0700
commit2d300fece23a4ae638b43ce9a7ac1e566ac6c843 (patch)
tree4e50fac4d14755c2206c48999c9b6fad3c920482
parentPull hp-machvec into release branch (diff)
parent[IA64] Increase max NR_CPUS on IA64 from 512 to 1024 (diff)
downloadlinux-dev-2d300fece23a4ae638b43ce9a7ac1e566ac6c843.tar.xz
linux-dev-2d300fece23a4ae638b43ce9a7ac1e566ac6c843.zip
Pull 1024-cpu into release branch
-rw-r--r--arch/ia64/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 945c15a0722b..cb7fc19ff080 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -254,8 +254,8 @@ config SMP
If you don't know what to do here, say N.
config NR_CPUS
- int "Maximum number of CPUs (2-512)"
- range 2 512
+ int "Maximum number of CPUs (2-1024)"
+ range 2 1024
depends on SMP
default "64"
help