diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 937bdf0c3859fad503acc36ff91a070159f6ebc6..59c9255ab9d0cae5e981f94c81fc4cad47ce45ad 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -201,7 +201,6 @@ 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
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 148e752a70f731889d435a86f303c422771ff171..725aa84f2faa2ba784c3effcf80bc5aca6426083 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -252,7 +252,7 @@ int pfn_valid(unsigned long pfn)
 	if (!early_section(ms))
 		return pfn_section_valid(ms, pfn);
 
-	return memblock_is_map_memory(addr);
+	return memblock_is_memory(addr);
 }
 EXPORT_SYMBOL(pfn_valid);