2 files changed, 5 insertions, 3 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 697ea0510729..cf5f1dafcf74 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -260,7 +260,8 @@ config GENERIC_CALIBRATE_DELAY
         def_bool y
 
 config ZONE_DMA32
-        def_bool y
+        bool "Support DMA32 zone" if EXPERT
+        default y
 
 config HAVE_GENERIC_GUP
         def_bool y
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index d2adffb81b5d..f643bd45ff69 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -191,8 +191,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
 {
         unsigned long max_zone_pfns[MAX_NR_ZONES]  = {0};
 
-        if (IS_ENABLED(CONFIG_ZONE_DMA32))
-                max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
+#ifdef CONFIG_ZONE_DMA32
+        max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
+#endif
         max_zone_pfns[ZONE_NORMAL] = max;
 
         free_area_init_nodes(max_zone_pfns);