mm/sparse: delete old sparse_init and enable new one

[mirror_ubuntu-focal-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 9ae1b6a8e30fe29fdea279f4cb363b22f6cc7880..adfeae4decb4f660a6413c9efca7d6f44f89a9ea 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -118,10 +118,6 @@ config SPARSEMEM_EXTREME
 config SPARSEMEM_VMEMMAP_ENABLE
        bool
 
-config SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
-       def_bool y
-       depends on SPARSEMEM && X86_64
-
 config SPARSEMEM_VMEMMAP
        bool "Sparse Memory virtual memmap"
        depends on SPARSEMEM && SPARSEMEM_VMEMMAP_ENABLE
@@ -638,7 +634,7 @@ config DEFERRED_STRUCT_PAGE_INIT
        bool "Defer initialisation of struct pages to kthreads"
        default n
        depends on NO_BOOTMEM
-       depends on !FLATMEM
+       depends on SPARSEMEM
        depends on !NEED_PER_CPU_KM
        help
          Ordinarily all struct pages are initialised during early boot in a