diff options
authorH. Peter Anvin <>2008-04-06 10:35:10 -0700
committerH. Peter Anvin <>2008-05-02 16:18:40 -0700
commit59df83992b6ec962fdf69e4db4c18951499cc67c (patch)
parent3f02c4e0e5d20884677a0259de42e553514534f9 (diff)
s390: types: use <asm-generic/int-*.h> for the s390 architecture
This modifies <asm-s390/types.h> to use the <asm-generic/int-*.h> generic include files. Signed-off-by: H. Peter Anvin <> Cc: Martin Schwidefsky <> Cc: Heiko Carstens <>
1 files changed, 6 insertions, 42 deletions
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 2c5879ae90ca..78dda038dd47 100644
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -9,34 +9,16 @@
#ifndef _S390_TYPES_H
#define _S390_TYPES_H
+#ifndef __s390x__
+# include <asm-generic/int-l64.h>
+# include <asm-generic/int-ll64.h>
#ifndef __ASSEMBLY__
typedef unsigned short umode_t;
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-#ifndef __s390x__
-#if defined(__GNUC__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#else /* __s390x__ */
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
/* A address type so that arithmetic can be done on it & it can be upgraded to
64 bit when necessary
@@ -58,24 +40,6 @@ typedef __signed__ long saddr_t;
#ifndef __ASSEMBLY__
-typedef signed char s8;
-typedef unsigned char u8;
-typedef signed short s16;
-typedef unsigned short u16;
-typedef signed int s32;
-typedef unsigned int u32;
-#ifndef __s390x__
-typedef signed long long s64;
-typedef unsigned long long u64;
-#else /* __s390x__ */
-typedef signed long s64;
-typedef unsigned long u64;
-#endif /* __s390x__ */
typedef u32 dma_addr_t;
#ifndef __s390x__