summaryrefslogtreecommitdiff
path: root/include/asm-s390/types.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-s390/types.h')
-rw-r--r--include/asm-s390/types.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 78dda038dd47..41c547656130 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -10,9 +10,9 @@
#define _S390_TYPES_H
#ifndef __s390x__
-# include <asm-generic/int-l64.h>
-#else
# include <asm-generic/int-ll64.h>
+#else
+# include <asm-generic/int-l64.h>
#endif
#ifndef __ASSEMBLY__
@@ -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 {