Commit ce5c2d2c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

arm64: fixup for mm renames

__GFP_WAIT was renamed for __GFP_RECLAIM and the gfpflags_allow_blocking()
helper was added.

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad804a0b
...@@ -562,7 +562,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, ...@@ -562,7 +562,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,
*/ */
gfp |= __GFP_ZERO; gfp |= __GFP_ZERO;
if (gfp & __GFP_WAIT) { if (gfpflags_allow_blocking(gfp)) {
struct page **pages; struct page **pages;
pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL, coherent); pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL, coherent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment