aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2005-06-23 03:07:49 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:03 -0400
commite1785e85b9c81c67b581b511ee4efac6c81e9edb (patch)
tree97d0470fec528f9c995674abd39c02c36ec2d110 /mm
parent074ccf8016b61f4b40066f8d737ab31e17a6afd1 (diff)
[PATCH] mm/Kconfig: hide "Memory Model" selection menu
I got some feedback from users who think that the new "Memory Model" menu is a little invasive. This patch will hide that menu, except when CONFIG_EXPERIMENTAL is enabled *or* when an individual architecture wants it. An individual arch may want to enable it because they've removed their arch-specific DISCONTIG prompt in favor of the mm/Kconfig one. Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig21
1 files changed, 17 insertions, 4 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 0320f066228c..7d3a0054cba1 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -1,9 +1,14 @@
1config SELECT_MEMORY_MODEL
2 def_bool y
3 depends on EXPERIMENTAL || ARCH_SELECT_MEMORY_MODEL
4
1choice 5choice
2 prompt "Memory model" 6 prompt "Memory model"
3 default DISCONTIGMEM if ARCH_DISCONTIGMEM_DEFAULT 7 depends on SELECT_MEMORY_MODEL
4 default FLATMEM 8 default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
9 default FLATMEM_MANUAL
5 10
6config FLATMEM 11config FLATMEM_MANUAL
7 bool "Flat Memory" 12 bool "Flat Memory"
8 depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE 13 depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE
9 help 14 help
@@ -14,7 +19,7 @@ config FLATMEM
14 19
15 If unsure, choose this option over any other. 20 If unsure, choose this option over any other.
16 21
17config DISCONTIGMEM 22config DISCONTIGMEM_MANUAL
18 bool "Discontigious Memory" 23 bool "Discontigious Memory"
19 depends on ARCH_DISCONTIGMEM_ENABLE 24 depends on ARCH_DISCONTIGMEM_ENABLE
20 help 25 help
@@ -22,6 +27,14 @@ config DISCONTIGMEM
22 27
23endchoice 28endchoice
24 29
30config DISCONTIGMEM
31 def_bool y
32 depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL
33
34config FLATMEM
35 def_bool y
36 depends on !DISCONTIGMEM || FLATMEM_MANUAL
37
25# 38#
26# Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's 39# Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
27# to represent different areas of memory. This variable allows 40# to represent different areas of memory. This variable allows