* [2.6 patch] sh64: fix dma_cache_sync() compilation
@ 2007-10-22 2:47 Adrian Bunk
2007-10-24 7:36 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2007-10-22 2:47 UTC (permalink / raw)
To: Ralf Baechle, lethal; +Cc: linuxsh-shmedia-dev, linux-kernel
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>
---
e4e74353f092fa502d4c7e9c3c16a0d7a3bcf85e
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index e661857..e57f129 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -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));
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [2.6 patch] sh64: fix dma_cache_sync() compilation
2007-10-22 2:47 [2.6 patch] sh64: fix dma_cache_sync() compilation Adrian Bunk
@ 2007-10-24 7:36 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2007-10-24 7:36 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Ralf Baechle, linuxsh-shmedia-dev, linux-kernel
On Mon, Oct 22, 2007 at 04:47:30AM +0200, Adrian Bunk wrote:
> This patch fixes the following compile error caused by
> commit 622a9edd919de98ef59571ae6c40c7458244e3f2:
>
Applied, thanks Adrian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-24 7:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-22 2:47 [2.6 patch] sh64: fix dma_cache_sync() compilation Adrian Bunk
2007-10-24 7:36 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox