projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sunxi-fixes-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux-drm-fsl-dcu.git]
/
arch
/
arm64
/
mm
/
dma-mapping.c
diff --git
a/arch/arm64/mm/dma-mapping.c
b/arch/arm64/mm/dma-mapping.c
index 0bcc4bc94b4ad3b4d72d735dc7e88a190c2e5cbe..99224dcebdc51d40cb2dff423280727ec44bacd3 100644
(file)
--- a/
arch/arm64/mm/dma-mapping.c
+++ b/
arch/arm64/mm/dma-mapping.c
@@
-100,7
+100,7
@@
static void *__dma_alloc_coherent(struct device *dev, size_t size,
if (IS_ENABLED(CONFIG_ZONE_DMA) &&
dev->coherent_dma_mask <= DMA_BIT_MASK(32))
flags |= GFP_DMA;
- if (
IS_ENABLED(CONFIG_DMA_CMA
) && (flags & __GFP_WAIT)) {
+ if (
dev_get_cma_area(dev
) && (flags & __GFP_WAIT)) {
struct page *page;
void *addr;