]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
arm64: fixup for mm renames
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 5 Jan 2016 12:09:01 +0000 (12:09 +0000)
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Mon, 11 Jan 2016 09:54:40 +0000 (09:54 +0000)
__GFP_WAIT was renamed for __GFP_RECLAIM and the gfpflags_allow_blocking()
helper was added.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
arch/arm64/mm/dma-mapping.c

index 2de4fbb7d8a9cf678fa89830124d0ad0c6655026..624451ceb935333df38e4740c092045c3aec14f7 100644 (file)
@@ -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);
 
        /*