aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-25 16:56:43 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-27 16:45:50 +1000
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 f70cd3fb32d..ec3c2ee8bf8 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 cecce6c6dfb..65a2a027ac9 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;
};