tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Miklos Szeredi and committed by
Linus Torvalds f3c072ad 8d6c83f0

-7
-7
arch/um/include/asm/dma-mapping.h
··· 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)