---

yaml --- r: 11668 b: refs/heads/master c: 8168f90 h: refs/heads/master v: v3
git-mirror · Oct 27, 2005 · c101580 · c101580
1 parent 304f721
commit c101580
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf20a0000377f7bdeb42b78b10ed578deb3d63f1
+refs/heads/master: 8168f902fa9c2ca8930ea8d72cce283234df03b8
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
@@ -532,7 +532,7 @@ static int ibmveth_open(struct net_device *netdev)
 
 	if(lpar_rc != H_Success) {
 		ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
-		ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n",
+		ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n",
 				     adapter->buffer_list_dma,
 				     adapter->filter_list_dma,
 				     rxq_desc.desc,

diff --git a/trunk/include/asm-powerpc/types.h b/trunk/include/asm-powerpc/types.h
@@ -85,7 +85,11 @@ typedef unsigned long long u64;
 
 typedef __vector128 vector128;
 
+#ifdef __powerpc64__
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 typedef u64 dma64_addr_t;
 
 typedef struct {

diff --git a/trunk/include/asm-ppc64/scatterlist.h b/trunk/include/asm-ppc64/scatterlist.h
@@ -19,7 +19,7 @@ struct scatterlist {
 	unsigned int length;
 
 	/* For TCE support */
-	u32 dma_address;
+	dma_addr_t dma_address;
 	u32 dma_length;
 };