diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-10-25 16:56:43 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 16:45:50 +1000 |
| commit | 8168f902fa9c2ca8930ea8d72cce283234df03b8 (patch) | |
| tree | 2a7bd8d19692e6ba5f86b92d35a8dc8206fc0ff1 | |
| parent | bf20a0000377f7bdeb42b78b10ed578deb3d63f1 (diff) | |
| download | kernel_samsung_tuna-8168f902fa9c2ca8930ea8d72cce283234df03b8.zip kernel_samsung_tuna-8168f902fa9c2ca8930ea8d72cce283234df03b8.tar.gz kernel_samsung_tuna-8168f902fa9c2ca8930ea8d72cce283234df03b8.tar.bz2 | |
[PATCH] ppc64: make dma_addr_t 64 bits
There has been a need expressed for dma_addr_t to be 64 bits on PPC64.
This patch does that.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | drivers/net/ibmveth.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/types.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc64/scatterlist.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index f5dc632..cbe9368 100644 --- a/drivers/net/ibmveth.c +++ b/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/include/asm-powerpc/types.h b/include/asm-powerpc/types.h index f70cd3f..ec3c2ee 100644 --- a/include/asm-powerpc/types.h +++ b/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/include/asm-ppc64/scatterlist.h b/include/asm-ppc64/scatterlist.h index cecce6c..65a2a02 100644 --- a/include/asm-ppc64/scatterlist.h +++ b/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; }; |