aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-25 02:56:43 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-27 02:45:50 -0400
commit8168f902fa9c2ca8930ea8d72cce283234df03b8 (patch)
tree2a7bd8d19692e6ba5f86b92d35a8dc8206fc0ff1 /include
parentbf20a0000377f7bdeb42b78b10ed578deb3d63f1 (diff)
[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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/types.h4
-rw-r--r--include/asm-ppc64/scatterlist.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
index f70cd3fb32d9..ec3c2ee8bf86 100644
--- a/include/asm-powerpc/types.h
+++ b/include/asm-powerpc/types.h
@@ -85,7 +85,11 @@ typedef unsigned long long u64;
85 85
86typedef __vector128 vector128; 86typedef __vector128 vector128;
87 87
88#ifdef __powerpc64__
89typedef u64 dma_addr_t;
90#else
88typedef u32 dma_addr_t; 91typedef u32 dma_addr_t;
92#endif
89typedef u64 dma64_addr_t; 93typedef u64 dma64_addr_t;
90 94
91typedef struct { 95typedef struct {
diff --git a/include/asm-ppc64/scatterlist.h b/include/asm-ppc64/scatterlist.h
index cecce6c6dfbb..65a2a027ac94 100644
--- a/include/asm-ppc64/scatterlist.h
+++ b/include/asm-ppc64/scatterlist.h
@@ -19,7 +19,7 @@ struct scatterlist {
19 unsigned int length; 19 unsigned int length;
20 20
21 /* For TCE support */ 21 /* For TCE support */
22 u32 dma_address; 22 dma_addr_t dma_address;
23 u32 dma_length; 23 u32 dma_length;
24}; 24};
25 25