From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri, 30 May 2008 08:03:26 +0000 (+0200)
Subject: [S390] s390 types: make dma_addr_t 64 bit capable
X-Git-Tag: v2.6.26-rc5~35^2~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bebd9a455b2593ba6543b961bc82c43350c2d8d9;p=linux-2.6

[S390] s390 types: make dma_addr_t 64 bit capable

virtio tests with guests larger than 4 GB revealed that the dma_addr_t
definition for s390 did not make it into the 64bit world.
This patch changes the definition on s390 to have an u64 on 64bit and
u32 on 32bit systems.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 0e959e20e9..41c5476561 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -40,7 +40,13 @@ typedef __signed__ long saddr_t;
 
 #ifndef __ASSEMBLY__
 
+typedef u64 dma64_addr_t;
+#ifdef __s390x__
+/* DMA addresses come in 32-bit and 64-bit flavours. */
+typedef u64 dma_addr_t;
+#else
 typedef u32 dma_addr_t;
+#endif
 
 #ifndef __s390x__
 typedef union {