Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index db8c2a3..eed59ec 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -289,6 +289,7 @@ config ARCH_SELECT_MEMORY_MODEL
 
 config ARCH_DISCONTIGMEM_ENABLE
        def_bool y
+       depends on BROKEN
        help
          Say Y to support efficient handling of discontiguous physical memory,
          for architectures which are either NUMA (Non-Uniform Memory Access)
@@ -300,12 +301,11 @@ config ARCH_FLATMEM_ENABLE
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
-       depends on ARCH_DISCONTIGMEM_ENABLE
        select SPARSEMEM_VMEMMAP_ENABLE
 
-config ARCH_DISCONTIGMEM_DEFAULT
+config ARCH_SPARSEMEM_DEFAULT
        def_bool y
-       depends on ARCH_DISCONTIGMEM_ENABLE
+       depends on ARCH_SPARSEMEM_ENABLE
 
 config NUMA
        bool "NUMA support"
@@ -330,7 +330,7 @@ config NODES_SHIFT
 # VIRTUAL_MEM_MAP has been retained for historical reasons.
 config VIRTUAL_MEM_MAP
        bool "Virtual mem map"
-       depends on !SPARSEMEM
+       depends on !SPARSEMEM && !FLATMEM
        default y
        help
          Say Y to compile the kernel with support for a virtual mem map.
@@ -343,9 +343,6 @@ config HOLES_IN_ZONE
        bool
        default y if VIRTUAL_MEM_MAP
 
-config HAVE_ARCH_EARLY_PFN_TO_NID
-       def_bool NUMA && SPARSEMEM
-
 config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y
        depends on NUMA