Skip to contentSkip to conversation

dma-mapping: fix build errors on !HAS_DMA architectures

PATCH New Heiko Carstens 1 participant 1 message Aug 13, 2010 DMA mapping helpers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-mapping: fix build errors on !HAS_DMA architectures

From: Heiko Carstens <[email protected]>

commit 4565f0170dfc849b3629c27d769db800467baa62 "dma-mapping: unify dma_get_cache_alignment implementations" causes build errors on !HAS_DMA architectures/platforms like s390 and sun3:

include/linux/dma-mapping.h:145: error: static declaration of 'dma_get_cache_alignment' follows non-static declaration include/asm-generic/dma-mapping-broken.h:73: error: previous declaration of 'dma_get_cache_alignment' was here

Fix this by adding an explicit ifdef.

---
 include/linux/dma-mapping.h |    2 ++
 1 file changed, 2 insertions(+)
include/linux/dma-mapping.h +2 -0
@@ -142,6 +142,7 @@ static inline int dma_set_seg_boundary(s
 		return -EIO;
 }
 
+#ifdef CONFIG_HAS_DMA
 static inline int dma_get_cache_alignment(void)
 {
 #ifdef ARCH_DMA_MINALIGN
@@ -149,6 +150,7 @@ static inline int dma_get_cache_alignmen
 #endif
 	return 1;
 }
+#endif
 
 /* flags for the coherent memory api */
 #define	DMA_MEMORY_MAP			0x01