x86: change maximum NR_CPUS to 4096 and MAX_NUMNODES to 512

  * Change the range of NR_CPUS from 2-255 to 2-4096 and change the
    range of MAX_NUMNODES (NODES_SHIFT) from 1-32768 to 1-512.

  * Alter comment about how much each increment of NR_CPUS consumes.
    (This was found by configuring for 256 cpus and then 512 cpus
     and dividing the difference by 256.)

Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fe361ae7ef2f..bbafeac89116 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -565,18 +565,18 @@ config IOMMU_HELPER
         def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
 
 config NR_CPUS
-        int "Maximum number of CPUs (2-255)"
-        range 2 255
+        int "Maximum number of CPUs (2-4096)"
+        range 2 4096
         depends on SMP
         default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
         default "8"
         help
           This allows you to specify the maximum number of CPUs which this
-          kernel will support.  The maximum supported value is 255 and the
+          kernel will support.  The maximum supported value is 4096 and the
           minimum value which makes sense is 2.
 
           This is purely to save memory - each supported CPU adds
-          approximately eight kilobytes to the kernel image.
+          approximately one kilobyte to the kernel image.
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
@@ -968,8 +968,8 @@ config NUMA_EMU
           number of nodes. This is only useful for debugging.
 
 config NODES_SHIFT
-        int "Max num nodes shift(1-15)"
-        range 1 15  if X86_64
+        int "Max num nodes shift(1-9)"
+        range 1 9  if X86_64
         default "6" if X86_64
         default "4" if X86_NUMAQ
         default "3"