3.16.55-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig hch@lst.de
commit 860dd4424f344400b491b212ee4acb3a358ba9d9 upstream.
Provide the dummy version of dma_get_cache_alignment that always returns 1 even if CONFIG_HAS_DMA is not set, so that drivers and subsystems can use it without ifdefs.
Signed-off-by: Christoph Hellwig hch@lst.de Signed-off-by: Martin K. Petersen martin.petersen@oracle.com [bwh: Backported to 3.16: Also delete the conflicting declaration in <asm-generic/dma-mapping-broken.h>] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -181,7 +181,6 @@ static inline void *dma_zalloc_coherent( return ret; }
-#ifdef CONFIG_HAS_DMA static inline int dma_get_cache_alignment(void) { #ifdef ARCH_DMA_MINALIGN @@ -189,7 +188,6 @@ static inline int dma_get_cache_alignmen #endif return 1; } -#endif
/* flags for the coherent memory api */ #define DMA_MEMORY_MAP 0x01 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h @@ -85,9 +85,6 @@ dma_supported(struct device *dev, u64 ma extern int dma_set_mask(struct device *dev, u64 mask);
-extern int -dma_get_cache_alignment(void); - extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction);