Pull 1024-cpu into release branch

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 945c15a0722b894eeac86f2778326313eadf4b5f..cb7fc19ff080dc6e0cbd5b07ba6774214c9c2a87 100644 (file)
--- 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