tile: replace ZONE_DMA with ZONE_DMA32

tile uses ZONE_DMA for allocations below 32-bits.  These days we
name the zone for that ZONE_DMA32, which will allow to use the
dma-direct and generic swiotlb code as-is, so rename it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 02f269cfa5382df9ef66228f3e9b169d2560d7e5..30c586686f2910171d15c7de8aec89fdaefd21c1 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -249,7 +249,7 @@ config HIGHMEM
 
          If unsure, say "true".
 
-config ZONE_DMA
+config ZONE_DMA32
        def_bool y
 
 config IOMMU_HELPER

diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c
index f2abedc8a080e2ab8ac2f2d269167b88634fd4c7..a267fa74004819c21bedb9608d510837c5444475 100644 (file)
--- a/arch/tile/kernel/pci-dma.c
+++ b/arch/tile/kernel/pci-dma.c
@@ -54,7 +54,7 @@ static void *tile_dma_alloc_coherent(struct device *dev, size_t size,
         * which case we will return NULL.  But such devices are uncommon.
         */
        if (dma_mask <= DMA_BIT_MASK(32)) {
-               gfp |= GFP_DMA;
+               gfp |= GFP_DMA32;
                node = 0;
        }
 
@@ -513,7 +513,7 @@ static void *tile_swiotlb_alloc_coherent(struct device *dev, size_t size,
                                         dma_addr_t *dma_handle, gfp_t gfp,
                                         unsigned long attrs)
 {
-       gfp |= GFP_DMA;
+       gfp |= GFP_DMA32;
        return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
 }
 

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index ad83c1e66dbd23c5ba46e20c8e5deefdf6f3655e..eb4e198f6f93cbcfc524662b763c167aaca60b81 100644 (file)
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -814,11 +814,11 @@ static void __init zone_sizes_init(void)
 #endif
 
                if (start < dma_end) {
-                       zones_size[ZONE_DMA] = min(zones_size[ZONE_NORMAL],
+                       zones_size[ZONE_DMA32] = min(zones_size[ZONE_NORMAL],
                                                   dma_end - start);
-                       zones_size[ZONE_NORMAL] -= zones_size[ZONE_DMA];
+                       zones_size[ZONE_NORMAL] -= zones_size[ZONE_DMA32];
                } else {
-                       zones_size[ZONE_DMA] = 0;
+                       zones_size[ZONE_DMA32] = 0;
                }
 
                /* Take zone metadata from controller 0 if we're isolnode. */
@@ -830,7 +830,7 @@ static void __init zone_sizes_init(void)
                       PFN_UP(node_percpu[i]));
 
                /* Track the type of memory on each node */
-               if (zones_size[ZONE_NORMAL] || zones_size[ZONE_DMA])
+               if (zones_size[ZONE_NORMAL] || zones_size[ZONE_DMA32])
                        node_set_state(i, N_NORMAL_MEMORY);
 #ifdef CONFIG_HIGHMEM
                if (end != start)