Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Stephen Rothwell and committed by
Paul Mackerras
8168f902 bf20a000

+6 -2
+1 -1
drivers/net/ibmveth.c
··· 532 532 533 533 if(lpar_rc != H_Success) { 534 534 ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc); 535 - ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n", 535 + ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n", 536 536 adapter->buffer_list_dma, 537 537 adapter->filter_list_dma, 538 538 rxq_desc.desc,
+4
include/asm-powerpc/types.h
··· 85 85 86 86 typedef __vector128 vector128; 87 87 88 + #ifdef __powerpc64__ 89 + typedef u64 dma_addr_t; 90 + #else 88 91 typedef u32 dma_addr_t; 92 + #endif 89 93 typedef u64 dma64_addr_t; 90 94 91 95 typedef struct {
+1 -1
include/asm-ppc64/scatterlist.h
··· 19 19 unsigned int length; 20 20 21 21 /* For TCE support */ 22 - u32 dma_address; 22 + dma_addr_t dma_address; 23 23 u32 dma_length; 24 24 }; 25 25