diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-03-20 19:27:56 -0400 |
|---|---|---|
| committer | Michael Ellerman <michael@ellerman.id.au> | 2013-04-17 23:03:53 -0400 |
| commit | 45b02f8d94e3d86e77bde061b79b66cb5cfc6aaa (patch) | |
| tree | 1f781b4949f671292a4e8b5ee410af7a0dfd1299 | |
| parent | 933ee7119fb14156f46dc8bce8218f62db13c568 (diff) | |
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 <pebolle@tiscali.nl>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
| -rw-r--r-- | arch/metag/mm/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 5 | ||||
| -rw-r--r-- | arch/sh/mm/Kconfig | 7 |
3 files changed, 0 insertions, 17 deletions
diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig index 975f2f4e3ecf..ccf2576786ee 100644 --- a/arch/metag/mm/Kconfig +++ b/arch/metag/mm/Kconfig | |||
| @@ -93,11 +93,6 @@ config ARCH_SPARSEMEM_ENABLE | |||
| 93 | config ARCH_SPARSEMEM_DEFAULT | 93 | config ARCH_SPARSEMEM_DEFAULT |
| 94 | def_bool y | 94 | def_bool y |
| 95 | 95 | ||
| 96 | config MAX_ACTIVE_REGIONS | ||
| 97 | int | ||
| 98 | default "2" if SPARSEMEM | ||
| 99 | default "1" | ||
| 100 | |||
| 101 | config ARCH_POPULATES_NODE_MAP | 96 | config ARCH_POPULATES_NODE_MAP |
| 102 | def_bool y | 97 | def_bool y |
| 103 | 98 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index bdac46e3fc4e..a9ae67317374 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -428,11 +428,6 @@ config NODES_SHIFT | |||
| 428 | default "4" | 428 | default "4" |
| 429 | depends on NEED_MULTIPLE_NODES | 429 | depends on NEED_MULTIPLE_NODES |
| 430 | 430 | ||
| 431 | config MAX_ACTIVE_REGIONS | ||
| 432 | int | ||
| 433 | default "256" if PPC64 | ||
| 434 | default "32" | ||
| 435 | |||
| 436 | config ARCH_SELECT_MEMORY_MODEL | 431 | config ARCH_SELECT_MEMORY_MODEL |
| 437 | def_bool y | 432 | def_bool y |
| 438 | depends on PPC64 | 433 | depends on PPC64 |
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 5a43a871e097..dba285e86808 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
| @@ -137,13 +137,6 @@ config ARCH_SPARSEMEM_ENABLE | |||
| 137 | config ARCH_SPARSEMEM_DEFAULT | 137 | config ARCH_SPARSEMEM_DEFAULT |
| 138 | def_bool y | 138 | def_bool y |
| 139 | 139 | ||
| 140 | config MAX_ACTIVE_REGIONS | ||
| 141 | int | ||
| 142 | default "6" if (CPU_SUBTYPE_SHX3 && SPARSEMEM) | ||
| 143 | default "2" if SPARSEMEM && (CPU_SUBTYPE_SH7722 || \ | ||
| 144 | CPU_SUBTYPE_SH7785) | ||
| 145 | default "1" | ||
| 146 | |||
| 147 | config ARCH_SELECT_MEMORY_MODEL | 140 | config ARCH_SELECT_MEMORY_MODEL |
| 148 | def_bool y | 141 | def_bool y |
| 149 | 142 | ||