memblock: kill "config MAX_ACTIVE_REGIONS"

The Kconfig symbol MAX_ACTIVE_REGIONS is unused. Commit
0ee332c1451869963626bf9cac88f165a90990e1 ("memblock: Kill
early_node_map[]") removed the only place were it was actually used. But
it did not remove its Kconfig entries (for powerpc and sh).

Remove those two entries (and the entry for metag, that popped up in
v3.9-rc1).

Signed-off-by: Paul Bolle <[email protected]>
Acked-by: Paul Mundt <[email protected]>
Acked-by: James Hogan <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>

diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig
index 975f2f4e3ecf55f17521a3605c883bfd434fe554..ccf2576786eeca2ea1affec597bdd44894ea2151 100644 (file)
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
@@ -93,11 +93,6 @@ config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "2" if SPARSEMEM
-       default "1"
-
 config ARCH_POPULATES_NODE_MAP
        def_bool y
 

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bdac46e3fc4e496b9c950d68f82e0eafab8c52d7..a9ae67317374dc7b27b1bdccfa250b07dfadafb5 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -428,11 +428,6 @@ config NODES_SHIFT
        default "4"
        depends on NEED_MULTIPLE_NODES
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "256" if PPC64
-       default "32"
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
        depends on PPC64

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 5a43a871e097a5aa1d66f952320e624c60024a38..dba285e86808c7da56070728c3617c61ba7acdc9 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -137,13 +137,6 @@ config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
 
-config MAX_ACTIVE_REGIONS
-       int
-       default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM)
-       default "2" if SPARSEMEM && (CPU_SUBTYPE_SH7722 || \
-                      CPU_SUBTYPE_SH7785)
-       default "1"
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y