diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
| commit | 6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch) | |
| tree | fd475ac8f57a6bd39c976056324d1bc79d11b4c9 /arch/parisc/Kconfig | |
| parent | 837e9594fc3cb9a06bddd7ecf66151334a2e13d2 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge ../linux-2.6
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" |