From: Paul Bolle Date: Wed, 20 Mar 2013 23:27:56 +0000 (+0000) Subject: memblock: kill "config MAX_ACTIVE_REGIONS" X-Git-Tag: v3.10-rc1~121^2~72^2~22 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=45b02f8d94e3d86e77bde061b79b66cb5cfc6aaa;p=~emulex%2Finfiniband.git 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 Acked-by: Paul Mundt Acked-by: James Hogan Signed-off-by: Michael Ellerman --- diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig index 975f2f4e3ec..ccf2576786e 100644 --- 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 bdac46e3fc4..a9ae6731737 100644 --- 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 5a43a871e09..dba285e8680 100644 --- 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