diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2014-02-27 12:09:22 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-02-27 12:09:22 +0000 |
| commit | 19e7640d1f2302c20df2733e3e3df49acb17189e (patch) | |
| tree | 2fcf864c556e32cc562f51efbd92ad8d96c8389b /arch/arm64/mm/dma-mapping.c | |
| parent | 16fb1a9bec6126162560f159df449e4781560807 (diff) | |
| download | op-kernel-dev-19e7640d1f2302c20df2733e3e3df49acb17189e.zip op-kernel-dev-19e7640d1f2302c20df2733e3e3df49acb17189e.tar.gz | |
arm64: Replace ZONE_DMA32 with ZONE_DMA
On arm64 we do not have two DMA zones, so it does not make sense to
implement ZONE_DMA32. This patch changes ZONE_DMA32 with ZONE_DMA, the
latter covering 32-bit dma address space to honour GFP_DMA allocations.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 985fc07..26b2512c 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -39,9 +39,9 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, return NULL; } - if (IS_ENABLED(CONFIG_ZONE_DMA32) && + if (IS_ENABLED(CONFIG_ZONE_DMA) && dev->coherent_dma_mask <= DMA_BIT_MASK(32)) - flags |= GFP_DMA32; + flags |= GFP_DMA; if (IS_ENABLED(CONFIG_DMA_CMA)) { struct page *page; |
