dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Dave Hansen 2005-06-23 00:07:49 -07:00 committed by Linus Torvalds
parent 074ccf8016
commit e1785e85b9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mm/Kconfig
View File

@ -1,9 +1,14 @@
config SELECT_MEMORY_MODEL
def_bool y
depends on EXPERIMENTAL || ARCH_SELECT_MEMORY_MODEL
choice
prompt "Memory model"
default DISCONTIGMEM if ARCH_DISCONTIGMEM_DEFAULT
default FLATMEM
depends on SELECT_MEMORY_MODEL
default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
default FLATMEM_MANUAL
config FLATMEM
config FLATMEM_MANUAL
bool "Flat Memory"
depends on !ARCH_DISCONTIGMEM_ENABLE || ARCH_FLATMEM_ENABLE
help
@ -14,7 +19,7 @@ config FLATMEM
If unsure, choose this option over any other.
config DISCONTIGMEM
config DISCONTIGMEM_MANUAL
bool "Discontigious Memory"
depends on ARCH_DISCONTIGMEM_ENABLE
help
@ -22,6 +27,14 @@ config DISCONTIGMEM
endchoice
config DISCONTIGMEM
def_bool y
depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL
config FLATMEM
def_bool y
depends on !DISCONTIGMEM || FLATMEM_MANUAL
#
# Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
# to represent different areas of memory. This variable allows