aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
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