Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6dc8087ca5116f25cdc36a16fdfb18a10824952e
Commit: 6dc8087ca5116f25cdc36a16fdfb18a10824952e
Parent: cbd627a44928ba20b5c22b21b8ce2be27733a9d7
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 24 16:35:26 2007 +0900
Committer: Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Tue Oct 30 13:09:01 2007 +0900
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 <[EMAIL PROTECTED]>
Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
include/asm-sh64/dma-mapping.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index 1438b76..18f8dd6 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));
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
