aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-09-24 07:10:34 -0400
committerChristoph Hellwig <hch@lst.de>2018-10-09 09:08:46 -0400
commitb9fd04262a8abc366f40a9e97598e94591352c26 (patch)
treece83cdf3e2396cdd66310f91130055ff87d67550
parent7ed1d91a9ed61afe438ba51cbf49cb567ab7dca8 (diff)
dma-direct: respect DMA_ATTR_NO_WARN
Respect the DMA_ATTR_NO_WARN flags for allocations in dma-direct. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Robin Murphy <robin.murphy@arm.com>
-rw-r--r--kernel/dma/direct.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index a5a943836c8e..87a6bc2a96c0 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -114,6 +114,9 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size,
114 u64 phys_mask; 114 u64 phys_mask;
115 void *ret; 115 void *ret;
116 116
117 if (attrs & DMA_ATTR_NO_WARN)
118 gfp |= __GFP_NOWARN;
119
117 /* we always manually zero the memory once we are done: */ 120 /* we always manually zero the memory once we are done: */
118 gfp &= ~__GFP_ZERO; 121 gfp &= ~__GFP_ZERO;
119 gfp |= __dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask, 122 gfp |= __dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,