projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
mm
/
dma-default.c
diff --git
a/arch/mips/mm/dma-default.c
b/arch/mips/mm/dma-default.c
index a914dc1cb6d1bc339cf44cc0c5aeac887a2e5f74..d8117be729a20ee26d2df8bb42a6f58b9670f513 100644
(file)
--- a/
arch/mips/mm/dma-default.c
+++ b/
arch/mips/mm/dma-default.c
@@
-100,7
+100,7
@@
static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
else
#endif
#if defined(CONFIG_ZONE_DMA) && !defined(CONFIG_ZONE_DMA32)
- if (dev->coherent_dma_mask < DMA_BIT_MASK(
64
))
+ if (dev->coherent_dma_mask < DMA_BIT_MASK(
sizeof(phys_addr_t) * 8
))
dma_flag = __GFP_DMA;
else
#endif