From cd8d514c6d035ef80ac230b4ceb7335ec13e9e32 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Fri, 3 Apr 2015 13:00:05 +0200 Subject: [PATCH] arm64: add IOMMU dma_ops (fixup) add missing gfp allocation flags parameter Signed-off-by: Marek Szyprowski --- arch/arm64/mm/dma-mapping.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 3b07fb9b..05e51d7 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -466,12 +466,13 @@ static struct page **__iommu_get_pages(void *cpu_addr, struct dma_attrs *attrs) } static void *__iommu_alloc_atomic(struct device *dev, size_t size, - dma_addr_t *handle, bool coherent) + dma_addr_t *handle, gfp_t flags, + bool coherent) { struct page *page; void *addr; - addr = __alloc_from_pool(size, &page); + addr = __alloc_from_pool(size, &page, flags); if (!addr) return NULL; @@ -512,7 +513,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, size = PAGE_ALIGN(size); if (!(gfp & __GFP_WAIT)) - return __iommu_alloc_atomic(dev, size, handle, coherent); + return __iommu_alloc_atomic(dev, size, handle, gfp, coherent); /* * FIXME: This isn't even true any more! * -- 2.7.4