Browse Source

[ARM] mm: deprecate discontigmem on ARM

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 17 years ago
parent
commit
07a2f737ba
1 changed files with 5 additions and 1 deletions
  1. 5 1
      arch/arm/Kconfig

+ 5 - 1
arch/arm/Kconfig

@@ -839,6 +839,7 @@ config OABI_COMPAT
 	  UNPREDICTABLE (in fact it can be predicted that it won't work
 	  UNPREDICTABLE (in fact it can be predicted that it won't work
 	  at all). If in doubt say Y.
 	  at all). If in doubt say Y.
 
 
+# Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
 config ARCH_DISCONTIGMEM_ENABLE
 	bool
 	bool
 	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
@@ -851,8 +852,11 @@ config ARCH_DISCONTIGMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
 	bool
 	bool
 
 
+config ARCH_SPARSEMEM_DEFAULT
+	def_bool ARCH_SPARSEMEM_ENABLE
+
 config ARCH_SELECT_MEMORY_MODEL
 config ARCH_SELECT_MEMORY_MODEL
-	bool
+	def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
 
 
 config NODES_SHIFT
 config NODES_SHIFT
 	int
 	int