Skip to contentSkip to conversation

sh64: fix dma_cache_sync() compilation

PATCH Applied Adrian Bunk 2 participants 2 messages Oct 22, 2007 – Oct 24, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 -->

---
e4e74353f092fa502d4c7e9c3c16a0d7a3bcf85e

include/asm-sh64/dma-mapping.h +3 -2
index e661857..e57f129 100644
@@ -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));
Applied
#1 lore raw
Quoted 3 lines · Adrian Bunk

This patch fixes the following compile error caused by commit 622a9edd919de98ef59571ae6c40c7458244e3f2:

Applied, thanks Adrian.