diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-11-08 01:06:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-08 01:45:51 +0100 |
| commit | ce5c2d2c256a4c8b523036537cd6be2d6af8f69d (patch) | |
| tree | da83f4c4d020a09cbaa99182d2f37409436ac245 /arch | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-ce5c2d2c256a4c8b523036537cd6be2d6af8f69d.tar.xz linux-ce5c2d2c256a4c8b523036537cd6be2d6af8f69d.zip | |
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index bb4bf6a06ad6..131a199114b4 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -562,7 +562,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, */ gfp |= __GFP_ZERO; - if (gfp & __GFP_WAIT) { + if (gfpflags_allow_blocking(gfp)) { struct page **pages; pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL, coherent); |