mm/kconfig: move HOLES_IN_ZONE into mm

commit a55749639dc1 ("ia64: drop marked broken DISCONTIGMEM and
VIRTUAL_MEM_MAP") drop VIRTUAL_MEM_MAP, so there is no need HOLES_IN_ZONE
on ia64.

Also move HOLES_IN_ZONE into mm/Kconfig, select it if architecture needs
this feature.

Link: https://lkml.kernel.org/r/20210417075946.181402-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Cc: Will Deacon <will@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index d01a1545ab8f17abe6e6fbae7f5fcd37a8e2fb29..937bdf0c3859fad503acc36ff91a070159f6ebc6 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -201,6 +201,7 @@ config ARM64
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_GENERIC_VDSO
+       select HOLES_IN_ZONE
        select IOMMU_DMA if IOMMU_SUPPORT
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
@@ -1052,9 +1053,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
        def_bool y
        depends on NUMA
 
-config HOLES_IN_ZONE
-       def_bool y
-
 source "kernel/Kconfig.hz"
 
 config ARCH_SPARSEMEM_ENABLE

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index da22a35e6f036e78272e6500fcc2aa726ed12c22..f4ff6bd5fc1312da934e4effb9058f211f09592a 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -308,9 +308,6 @@ config NODES_SHIFT
          MAX_NUMNODES will be 2^(This value).
          If in doubt, use the default.
 
-config HOLES_IN_ZONE
-       bool
-
 config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y
        depends on NUMA

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4704a16c2e44608e41a70e01f11221cf9758901e..df02e36a4a8d6ed7e18cbcb6ded39c677366d7d6 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1233,9 +1233,6 @@ config HAVE_PLAT_MEMCPY
 config ISA_DMA_API
        bool
 
-config HOLES_IN_ZONE
-       bool
-
 config SYS_SUPPORTS_RELOCATABLE
        bool
        help

diff --git a/mm/Kconfig b/mm/Kconfig
index ded98fb859aba788d41865f3a358137fbb035def..055639e52459a464e4f7bdea5a2cf8e54e1118dd 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -96,6 +96,9 @@ config HAVE_FAST_GUP
        depends on MMU
        bool
 
+config HOLES_IN_ZONE
+       bool
+
 # Don't discard allocated memory used to track "memory" and "reserved" memblocks
 # after early boot, so it can still be used to test for validity of memory.
 # Also, memblocks are updated with memory hot(un)plug.