diff options
| author | Russell King <rmk+lkml@arm.linux.org.uk> | 2009-10-26 16:50:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 07:39:31 -0700 |
| commit | 1a83e175dc2c7be931a3ea9c7fb0769e6de55e90 (patch) | |
| tree | 8a5001cf6bd6a2c3a4d43a60af7a3fb23d396902 | |
| parent | c2494ace990c5d37cfe66911b85d28e6945eadfc (diff) | |
| download | linux-3.10-1a83e175dc2c7be931a3ea9c7fb0769e6de55e90.tar.gz linux-3.10-1a83e175dc2c7be931a3ea9c7fb0769e6de55e90.tar.bz2 linux-3.10-1a83e175dc2c7be931a3ea9c7fb0769e6de55e90.zip | |
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>
| -rw-r--r-- | mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 57963c6063d..f791196cee8 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 |