From: Srinivas Kandagatla Date: Tue, 5 Jan 2016 12:09:01 +0000 (+0000) Subject: arm64: fixup for mm renames X-Git-Tag: KARO-TXSD-2017-03-24~88^2~42^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=763a257d2ab99ec0164e29bc6fe66741bbec064d;p=karo-tx-linux.git arm64: fixup for mm renames __GFP_WAIT was renamed for __GFP_RECLAIM and the gfpflags_allow_blocking() helper was added. Signed-off-by: Srinivas Kandagatla --- diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 2de4fbb7d8a9..624451ceb935 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -1319,7 +1319,7 @@ static void *arm_iommu_alloc_attrs(struct device *dev, size_t size, *handle = DMA_ERROR_CODE; size = PAGE_ALIGN(size); - if (!(gfp & __GFP_WAIT)) + if (!gfpflags_allow_blocking(gfp)) return __iommu_alloc_atomic(dev, size, handle, gfp); /*