diff options
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index ce4dfa8b834d..01b78e7f992e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -161,6 +161,8 @@ config IA64_PAGE_SIZE_64KB | |||
161 | 161 | ||
162 | endchoice | 162 | endchoice |
163 | 163 | ||
164 | source kernel/Kconfig.hz | ||
165 | |||
164 | config IA64_BRL_EMU | 166 | config IA64_BRL_EMU |
165 | bool | 167 | bool |
166 | depends on ITANIUM | 168 | depends on ITANIUM |
@@ -197,7 +199,7 @@ config HOLES_IN_ZONE | |||
197 | bool | 199 | bool |
198 | default y if VIRTUAL_MEM_MAP | 200 | default y if VIRTUAL_MEM_MAP |
199 | 201 | ||
200 | config DISCONTIGMEM | 202 | config ARCH_DISCONTIGMEM_ENABLE |
201 | bool "Discontiguous memory support" | 203 | bool "Discontiguous memory support" |
202 | depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP | 204 | depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP |
203 | default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA | 205 | default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA |
@@ -300,6 +302,8 @@ config PREEMPT | |||
300 | Say Y here if you are building a kernel for a desktop, embedded | 302 | Say Y here if you are building a kernel for a desktop, embedded |
301 | or real-time system. Say N if you are unsure. | 303 | or real-time system. Say N if you are unsure. |
302 | 304 | ||
305 | source "mm/Kconfig" | ||
306 | |||
303 | config HAVE_DEC_LOCK | 307 | config HAVE_DEC_LOCK |
304 | bool | 308 | bool |
305 | depends on (SMP || PREEMPT) | 309 | depends on (SMP || PREEMPT) |