diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /arch/parisc/Kconfig | |
parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/parisc/Kconfig')
-rw-r--r-- | arch/parisc/Kconfig | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index e77a06e9621e..7c914a4c67c3 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -149,14 +149,20 @@ config HOTPLUG_CPU | |||
149 | default y if SMP | 149 | default y if SMP |
150 | select HOTPLUG | 150 | select HOTPLUG |
151 | 151 | ||
152 | config ARCH_SELECT_MEMORY_MODEL | ||
153 | def_bool y | ||
154 | depends on 64BIT | ||
155 | |||
152 | config ARCH_DISCONTIGMEM_ENABLE | 156 | config ARCH_DISCONTIGMEM_ENABLE |
153 | bool "Discontiguous memory support (EXPERIMENTAL)" | 157 | def_bool y |
154 | depends on 64BIT && EXPERIMENTAL | 158 | depends on 64BIT |
155 | help | 159 | |
156 | Say Y to support efficient handling of discontiguous physical memory, | 160 | config ARCH_FLATMEM_ENABLE |
157 | for architectures which are either NUMA (Non-Uniform Memory Access) | 161 | def_bool y |
158 | or have huge holes in the physical address space for other reasons. | 162 | |
159 | See <file:Documentation/vm/numa> for more. | 163 | config ARCH_DISCONTIGMEM_DEFAULT |
164 | def_bool y | ||
165 | depends on ARCH_DISCONTIGMEM_ENABLE | ||
160 | 166 | ||
161 | source "kernel/Kconfig.hz" | 167 | source "kernel/Kconfig.hz" |
162 | source "mm/Kconfig" | 168 | source "mm/Kconfig" |