diff options
| author | Anton Blanchard <anton@samba.org> | 2006-01-06 03:12:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:37 -0500 |
| commit | c898ec16e83331abde39118e22e9e38335bbb950 (patch) | |
| tree | bad725f27cb14e50663d39b8f36b1b79ab88fa80 /mm | |
| parent | 215c3409eed16c89b6d11ea1126bd9d4f36b9afd (diff) | |
[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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 21eb51d4da8f..b3db11f137e0 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -11,7 +11,7 @@ choice | |||
| 11 | 11 | ||
| 12 | config FLATMEM_MANUAL | 12 | config FLATMEM_MANUAL |
| 13 | bool "Flat Memory" | 13 | bool "Flat Memory" |
| 14 | depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE | 14 | depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE |
| 15 | help | 15 | help |
| 16 | This option allows you to change some of the ways that | 16 | This option allows you to change some of the ways that |
| 17 | Linux manages its memory internally. Most users will | 17 | Linux manages its memory internally. Most users will |