sh64: fix dma_cache_sync() compilation
This patch fixes the following compile error caused by commit 622a9edd919de98ef59571ae6c40c7458244e3f2: <-- snip --> ... CC init/main.o In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/dma-mapping.h:52, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/dmaengine.h:29, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/skbuff.h:29, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/netlink.h:155, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/genetlink.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/net/genetlink.h:4, from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/taskstats_kern.h:12, from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:46: include2/asm/dma-mapping.h: In function 'dma_cache_sync': include2/asm/dma-mapping.h:46: error: invalid operands to binary & (have 'void *' and 'int') make[2]: *** [init/main.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Родитель
cbd627a449
Коммит
6dc8087ca5
|
@ -42,8 +42,9 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
|
|||
static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
unsigned long s = (unsigned long) vaddr & L1_CACHE_ALIGN_MASK;
|
||||
unsigned long e = (vaddr + size) & L1_CACHE_ALIGN_MASK;
|
||||
unsigned long start = (unsigned long) vaddr;
|
||||
unsigned long s = start & L1_CACHE_ALIGN_MASK;
|
||||
unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
|
||||
|
||||
for (; s <= e; s += L1_CACHE_BYTES)
|
||||
asm volatile ("ocbp %0, 0" : : "r" (s));
|
||||
|
|
Загрузка…
Ссылка в новой задаче