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 ce95491abd6ae3dd6ea8acf401d2c004063058dd..adfeae4decb4f660a6413c9efca7d6f44f89a9ea 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -1,3 +1,6 @@
+
+menu "Memory Management options"
+
 config SELECT_MEMORY_MODEL
        def_bool y
        depends on ARCH_SELECT_MEMORY_MODEL
@@ -115,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
@@ -635,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
@@ -762,3 +761,5 @@ config GUP_BENCHMARK
 
 config ARCH_HAS_PTE_SPECIAL
        bool
+
+endmenu