Merge tag 'dma-mapping-4.16' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index c903f7c..9f3c47a 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -217,7 +217,7 @@ static void __init reserve_elfcorehdr(void)
 }
 #endif /* CONFIG_CRASH_DUMP */
 /*
- * Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It
+ * Return the maximum physical address for ZONE_DMA32 (DMA_BIT_MASK(32)). It
  * currently assumes that for memory starting above 4G, 32-bit devices will
  * use a DMA offset.
  */
@@ -233,8 +233,8 @@ 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_DMA))
-               max_zone_pfns[ZONE_DMA] = PFN_DOWN(max_zone_dma_phys());
+       if (IS_ENABLED(CONFIG_ZONE_DMA32))
+               max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
        max_zone_pfns[ZONE_NORMAL] = max;
 
        free_area_init_nodes(max_zone_pfns);
@@ -251,9 +251,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
        memset(zone_size, 0, sizeof(zone_size));
 
        /* 4GB maximum for 32-bit only capable devices */
-#ifdef CONFIG_ZONE_DMA
+#ifdef CONFIG_ZONE_DMA32
        max_dma = PFN_DOWN(arm64_dma_phys_limit);
-       zone_size[ZONE_DMA] = max_dma - min;
+       zone_size[ZONE_DMA32] = max_dma - min;
 #endif
        zone_size[ZONE_NORMAL] = max - max_dma;
 
@@ -266,10 +266,10 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
                if (start >= max)
                        continue;
 
-#ifdef CONFIG_ZONE_DMA
+#ifdef CONFIG_ZONE_DMA32
                if (start < max_dma) {
                        unsigned long dma_end = min(end, max_dma);
-                       zhole_size[ZONE_DMA] -= dma_end - start;
+                       zhole_size[ZONE_DMA32] -= dma_end - start;
                }
 #endif
                if (end > max_dma) {
@@ -470,7 +470,7 @@ void __init arm64_memblock_init(void)
        early_init_fdt_scan_reserved_mem();
 
        /* 4GB maximum for 32-bit only capable devices */
-       if (IS_ENABLED(CONFIG_ZONE_DMA))
+       if (IS_ENABLED(CONFIG_ZONE_DMA32))
                arm64_dma_phys_limit = max_zone_dma_phys();
        else
                arm64_dma_phys_limit = PHYS_MASK + 1;