Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e259f191f2244df04a7746fac1df8aa68ebd0106

Authored by Heiko Carstens
Committed by Linus Torvalds
1 parent c7dcf87a68
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

dma-mapping: fix build errors on !HAS_DMA architectures 

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.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

include/linux/dma-mapping.h
Diff comments   View file @ e259f19
... ... @@ -142,6 +142,7 @@
142 142 return -EIO;
143 143 }
144 144  
  145 +#ifdef CONFIG_HAS_DMA
145 146 static inline int dma_get_cache_alignment(void)
146 147 {
147 148 #ifdef ARCH_DMA_MINALIGN
... ... @@ -149,6 +150,7 @@
149 150 #endif
150 151 return 1;
151 152 }
  153 +#endif
152 154  
153 155 /* flags for the coherent memory api */
154 156 #define DMA_MEMORY_MAP 0x01