diff options
| author | Christoph Hellwig | 2017-12-24 13:52:03 +0100 |
|---|---|---|
| committer | Christoph Hellwig | 2018-01-15 09:36:01 +0100 |
| commit | ad67f5a6545f7fda8ec11d7a81e325a398e1a90f (patch) | |
| tree | 8fed727813808f9449d9c3a30d847b35222df63b /arch/arm64/mm/dma-mapping.c | |
| parent | mips: use swiotlb_{alloc,free} (diff) | |
| download | kernel-qcow2-linux-ad67f5a6545f7fda8ec11d7a81e325a398e1a90f.tar.gz kernel-qcow2-linux-ad67f5a6545f7fda8ec11d7a81e325a398e1a90f.tar.xz kernel-qcow2-linux-ad67f5a6545f7fda8ec11d7a81e325a398e1a90f.zip | |
arm64: replace ZONE_DMA with ZONE_DMA32
arm64 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>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 6840426bbe77..0d641875b20e 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -95,9 +95,9 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags, unsigned long attrs) { - if (IS_ENABLED(CONFIG_ZONE_DMA) && + if (IS_ENABLED(CONFIG_ZONE_DMA32) && dev->coherent_dma_mask <= DMA_BIT_MASK(32)) - flags |= GFP_DMA; + flags |= GFP_DMA32; if (dev_get_cma_area(dev) && gfpflags_allow_blocking(flags)) { struct page *page; void *addr; @@ -397,7 +397,7 @@ static int __init atomic_pool_init(void) page = dma_alloc_from_contiguous(NULL, nr_pages, pool_size_order, GFP_KERNEL); else - page = alloc_pages(GFP_DMA, pool_size_order); + page = alloc_pages(GFP_DMA32, pool_size_order); if (page) { int ret; |