Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f3c072ad727617f00bffae17dba8cd895f5b7bdb

Authored by Miklos Szeredi
Committed by Linus Torvalds
1 parent 8d6c83f0ba
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

uml: fix compile error in dma_get_cache_alignment() 

Fix uml compile error:

  include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
  arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here

Introduced by commit 4565f0170dfc ("dma-mapping: unify
dma_get_cache_alignment implementations")

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

arch/um/include/asm/dma-mapping.h
Diff comments   View file @ f3c072a
... ... @@ -95,13 +95,6 @@
95 95 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
96 96 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
97 97  
98   -static inline int
99   -dma_get_cache_alignment(void)
100   -{
101   - BUG();
102   - return(0);
103   -}
104   -
105 98 static inline void
106 99 dma_cache_sync(struct device *dev, void *vaddr, size_t size,
107 100 enum dma_data_direction direction)