10 files changed, 57 insertions, 9 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 9bef61b30367..8290b69da202 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -549,6 +549,11 @@ config NUMA
           Access).  This option is for configuring high-end multiprocessor
           server machines.  If in doubt, say N.
 
+config NODES_SHIFT
+        int
+        default "7"
+        depends on NEED_MULTIPLE_NODES
+
 # LARGE_VMALLOC is racy, if you *really* need it then fix it first
 config ALPHA_LARGE_VMALLOC
         bool
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dc5a9332c915..1dbf6ddb300d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -512,6 +512,12 @@ config ARCH_DISCONTIGMEM_ENABLE
           or have huge holes in the physical address space for other reasons.
           See <file:Documentation/vm/numa> for more.
 
+config NODES_SHIFT
+        int
+        default "4" if ARCH_LH7A40X
+        default "2"
+        depends on NEED_MULTIPLE_NODES
+
 source "mm/Kconfig"
 
 config LEDS
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 57301db056f5..18ec9fe6deb6 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -522,6 +522,12 @@ config NUMA
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
         depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
 
+config NODES_SHIFT
+        int
+        default "4" if X86_NUMAQ
+        default "3"
+        depends on NEED_MULTIPLE_NODES
+
 config HAVE_ARCH_BOOTMEM_NODE
         bool
         depends on NUMA
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index edffe25a477a..9f40eeff0b5c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -260,15 +260,6 @@ config NR_CPUS
           than 64 will cause the use of a CPU mask array, causing a small
           performance hit.
 
-config IA64_NR_NODES
-        int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC)
-        range 256 1024
-        depends on IA64_SGI_SN2 || IA64_GENERIC
-        default "256"
-        help
-          This option specifies the maximum number of nodes in your SSI system.
-          If in doubt, use the default.
-
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
         depends on SMP && EXPERIMENTAL
@@ -352,6 +343,16 @@ config NUMA
           Access).  This option is for configuring high-end multiprocessor
           server systems.  If in doubt, say N.
 
+config NODES_SHIFT
+        int "Max num nodes shift(3-10)"
+        range 3 10
+        default "8"
+        depends on NEED_MULTIPLE_NODES
+        help
+          This option specifies the maximum number of nodes in your SSI system.
+          MAX_NUMNODES will be 2^(This value).
+          If in doubt, use the default.
+
 # VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.
 # VIRTUAL_MEM_MAP has been retained for historical reasons.
 config VIRTUAL_MEM_MAP
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 05c864c6c2d9..41fd490af3b4 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -285,6 +285,11 @@ config NUMA
         depends on SMP && BROKEN
         default n
 
+config NODES_SHIFT
+        int
+        default "1"
+        depends on NEED_MULTIPLE_NODES
+
 # turning this on wastes a bunch of space.
 # Summit needs it only when NUMA is on
 config BOOT_IOREMAP
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e15709ce8866..7aec60d40420 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1590,6 +1590,11 @@ config ARCH_FLATMEM_ENABLE
         def_bool y
         depends on !NUMA
 
+config NODES_SHIFT
+        int
+        default "6"
+        depends on NEED_MULTIPLE_NODES
+
 source "mm/Kconfig"
 
 config SMP
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 2fdf21989dc2..19f911c5dd58 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -177,6 +177,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
 
+config NODES_SHIFT
+        int
+        default "3"
+        depends on NEED_MULTIPLE_NODES
+
 source "kernel/Kconfig.preempt"
 source "kernel/Kconfig.hz"
 source "mm/Kconfig"
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2cdc35ce8045..167e70e95556 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -649,6 +649,11 @@ config NUMA
         depends on PPC64
         default y if SMP && PPC_PSERIES
 
+config NODES_SHIFT
+        int
+        default "4"
+        depends on NEED_MULTIPLE_NODES
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on PPC64
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 58583f459471..2bcecf422573 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -527,6 +527,11 @@ config CPU_HAS_SR_RB
           See <file:Documentation/sh/register-banks.txt> for further
           information on SR.RB and register banking in the kernel in general.
 
+config NODES_SHIFT
+        int
+        default "1"
+        depends on NEED_MULTIPLE_NODES
+
 endmenu
 
 menu "Boot options"
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 7df2fe1844be..408d44a59756 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -288,6 +288,11 @@ config K8_NUMA
          Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
          instead, which also takes priority if both are compiled in.   
 
+config NODES_SHIFT
+        int
+        default "6"
+        depends on NEED_MULTIPLE_NODES
+
 # Dummy CONFIG option to select ACPI_NUMA from drivers/acpi/Kconfig.
 
 config X86_64_ACPI_NUMA