summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2006-01-06 00:12:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:37 -0800
commitc898ec16e83331abde39118e22e9e38335bbb950 (patch)
treebad725f27cb14e50663d39b8f36b1b79ab88fa80 /mm
parent215c3409eed16c89b6d11ea1126bd9d4f36b9afd (diff)
downloadlinux-3.10-c898ec16e83331abde39118e22e9e38335bbb950.tar.gz
linux-3.10-c898ec16e83331abde39118e22e9e38335bbb950.tar.bz2
linux-3.10-c898ec16e83331abde39118e22e9e38335bbb950.zip
[PATCH] allow flatmem to be disabled when only sparsemem is implemented
On architectures that implement sparsemem but not discontigmem we want to be able to hide the flatmem option in some cases. On ppc64 for example, when we select NUMA we must not select flatmem. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 21eb51d4da8..b3db11f137e 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -11,7 +11,7 @@ choice
config FLATMEM_MANUAL
bool "Flat Memory"
- depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE
+ depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE
help
This option allows you to change some of the ways that
Linux manages its memory internally. Most users will