diff options
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index ce4dfa8b834d..9f6a46caba9b 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -197,7 +197,7 @@ config HOLES_IN_ZONE | |||
197 | bool | 197 | bool |
198 | default y if VIRTUAL_MEM_MAP | 198 | default y if VIRTUAL_MEM_MAP |
199 | 199 | ||
200 | config DISCONTIGMEM | 200 | config ARCH_DISCONTIGMEM_ENABLE |
201 | bool "Discontiguous memory support" | 201 | 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 | 202 | 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 | 203 | default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA |
@@ -300,6 +300,8 @@ config PREEMPT | |||
300 | Say Y here if you are building a kernel for a desktop, embedded | 300 | Say Y here if you are building a kernel for a desktop, embedded |
301 | or real-time system. Say N if you are unsure. | 301 | or real-time system. Say N if you are unsure. |
302 | 302 | ||
303 | source "mm/Kconfig" | ||
304 | |||
303 | config HAVE_DEC_LOCK | 305 | config HAVE_DEC_LOCK |
304 | bool | 306 | bool |
305 | depends on (SMP || PREEMPT) | 307 | depends on (SMP || PREEMPT) |