Commit 8168f902 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent bf20a000

drivers/net/ibmveth.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/asm-powerpc/types.h

+4 −0
Original line number Diff line number Diff line
@@ -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 {

include/asm-ppc64/scatterlist.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct scatterlist { 
	unsigned int length;



	/* For TCE support */

	u32 dma_address;

	dma_addr_t dma_address;

	u32 dma_length;

};