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>
This commit is contained in:
Kefeng Wang 2021-06-30 18:49:57 -07:00 committed by Linus Torvalds
parent 3ebc57f403
commit 781eb2cdd2
4 changed files with 4 additions and 9 deletions

View File

@ -201,6 +201,7 @@ config ARM64
select HAVE_KPROBES select HAVE_KPROBES
select HAVE_KRETPROBES select HAVE_KRETPROBES
select HAVE_GENERIC_VDSO select HAVE_GENERIC_VDSO
select HOLES_IN_ZONE
select IOMMU_DMA if IOMMU_SUPPORT select IOMMU_DMA if IOMMU_SUPPORT
select IRQ_DOMAIN select IRQ_DOMAIN
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
@ -1052,9 +1053,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
def_bool y def_bool y
depends on NUMA depends on NUMA
config HOLES_IN_ZONE
def_bool y
source "kernel/Kconfig.hz" source "kernel/Kconfig.hz"
config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_ENABLE

View File

@ -308,9 +308,6 @@ config NODES_SHIFT
MAX_NUMNODES will be 2^(This value). MAX_NUMNODES will be 2^(This value).
If in doubt, use the default. If in doubt, use the default.
config HOLES_IN_ZONE
bool
config HAVE_ARCH_NODEDATA_EXTENSION config HAVE_ARCH_NODEDATA_EXTENSION
def_bool y def_bool y
depends on NUMA depends on NUMA

View File

@ -1233,9 +1233,6 @@ config HAVE_PLAT_MEMCPY
config ISA_DMA_API config ISA_DMA_API
bool bool
config HOLES_IN_ZONE
bool
config SYS_SUPPORTS_RELOCATABLE config SYS_SUPPORTS_RELOCATABLE
bool bool
help help

View File

@ -96,6 +96,9 @@ config HAVE_FAST_GUP
depends on MMU depends on MMU
bool bool
config HOLES_IN_ZONE
bool
# Don't discard allocated memory used to track "memory" and "reserved" memblocks # 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. # after early boot, so it can still be used to test for validity of memory.
# Also, memblocks are updated with memory hot(un)plug. # Also, memblocks are updated with memory hot(un)plug.