Commit 781eb2cd authored by Kefeng Wang's avatar Kefeng Wang Committed by Linus Torvalds
Browse files

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: default avatarKefeng 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3ebc57f4

arch/arm64/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -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

arch/ia64/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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

arch/mips/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -1233,9 +1233,6 @@ config HAVE_PLAT_MEMCPY 
config ISA_DMA_API

	bool



config HOLES_IN_ZONE

	bool



config SYS_SUPPORTS_RELOCATABLE

	bool

	help

mm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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.