GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-21 21:53:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dma-mapping: translate __GFP_NOFAIL to DMA_ATTR_NO_WARN

Browse source 
This allows all dma_map_ops instances to entirely rely on
DMA_ATTR_NO_WARN going forward.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Robin Murphy <robin.murphy@arm.com>
This commit is contained in:
Christoph Hellwig 2018-09-24 13:06:58 +02:00
parent 79ac32a427
commit 7ed1d91a9e
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/linux/dma-mapping.h
View file

@ -558,9 +558,11 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
} }
static inline void *dma_alloc_coherent(struct device *dev, size_t size, static inline void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag) dma_addr_t *dma_handle, gfp_t gfp)
{ {
return dma_alloc_attrs(dev, size, dma_handle, flag, 0);
return dma_alloc_attrs(dev, size, dma_handle, gfp,
(gfp & __GFP_NOWARN) ? DMA_ATTR_NO_WARN : 0);
} }
static inline void dma_free_coherent(struct device *dev, size_t size, static inline void dma_free_coherent(struct device *dev, size_t size,
@ -794,8 +796,12 @@ static inline void dmam_release_declared_memory(struct device *dev)
static inline void *dma_alloc_wc(struct device *dev, size_t size, static inline void *dma_alloc_wc(struct device *dev, size_t size,
dma_addr_t *dma_addr, gfp_t gfp) dma_addr_t *dma_addr, gfp_t gfp)
{ {
return dma_alloc_attrs(dev, size, dma_addr, gfp, unsigned long attrs = DMA_ATTR_NO_WARN;
DMA_ATTR_WRITE_COMBINE);
if (gfp & __GFP_NOWARN)
attrs |= DMA_ATTR_NO_WARN;
return dma_alloc_attrs(dev, size, dma_addr, gfp, attrs);
} }
#ifndef dma_alloc_writecombine #ifndef dma_alloc_writecombine
#define dma_alloc_writecombine dma_alloc_wc #define dma_alloc_writecombine dma_alloc_wc