The following commit has been merged in the linux branch: commit 1a83e175dc2c7be931a3ea9c7fb0769e6de55e90 Author: Russell King rmk+lkml@arm.linux.org.uk Date: Mon Oct 26 16:50:12 2009 -0700

mm: fix sparsemem configuration

Currently, sparsemem is only available if EXPERIMENTAL is enabled. However, it hasn't ever been marked experimental.

It's been about four years since sparsemem was merged, and we have platforms which depend on it; allow architectures to decide whether sparsemem should be the default memory model.

Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/mm/Kconfig b/mm/Kconfig index 57963c6..f791196 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -67,7 +67,7 @@ config DISCONTIGMEM

config SPARSEMEM def_bool y - depends on SPARSEMEM_MANUAL + depends on (!SELECT_MEMORY_MODEL && ARCH_SPARSEMEM_ENABLE) || SPARSEMEM_MANUAL

config FLATMEM def_bool y