Commit 59df83992b6ec962fdf69e4db4c18951499cc67c
1 parent
3f02c4e0e5
Exists in
master
and in
7 other branches
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 <hpa@zytor.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Showing 1 changed file with 6 additions and 42 deletions Side-by-side Diff
include/asm-s390/types.h
| ... | ... | @@ -9,34 +9,16 @@ |
| 9 | 9 | #ifndef _S390_TYPES_H |
| 10 | 10 | #define _S390_TYPES_H |
| 11 | 11 | |
| 12 | +#ifndef __s390x__ | |
| 13 | +# include <asm-generic/int-l64.h> | |
| 14 | +#else | |
| 15 | +# include <asm-generic/int-ll64.h> | |
| 16 | +#endif | |
| 17 | + | |
| 12 | 18 | #ifndef __ASSEMBLY__ |
| 13 | 19 | |
| 14 | 20 | typedef unsigned short umode_t; |
| 15 | 21 | |
| 16 | -/* | |
| 17 | - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | |
| 18 | - * header files exported to user space | |
| 19 | - */ | |
| 20 | - | |
| 21 | -typedef __signed__ char __s8; | |
| 22 | -typedef unsigned char __u8; | |
| 23 | - | |
| 24 | -typedef __signed__ short __s16; | |
| 25 | -typedef unsigned short __u16; | |
| 26 | - | |
| 27 | -typedef __signed__ int __s32; | |
| 28 | -typedef unsigned int __u32; | |
| 29 | - | |
| 30 | -#ifndef __s390x__ | |
| 31 | -#if defined(__GNUC__) | |
| 32 | -__extension__ typedef __signed__ long long __s64; | |
| 33 | -__extension__ typedef unsigned long long __u64; | |
| 34 | -#endif | |
| 35 | -#else /* __s390x__ */ | |
| 36 | -typedef __signed__ long __s64; | |
| 37 | -typedef unsigned long __u64; | |
| 38 | -#endif | |
| 39 | - | |
| 40 | 22 | /* A address type so that arithmetic can be done on it & it can be upgraded to |
| 41 | 23 | 64 bit when necessary |
| 42 | 24 | */ |
| ... | ... | @@ -57,24 +39,6 @@ |
| 57 | 39 | #endif |
| 58 | 40 | |
| 59 | 41 | #ifndef __ASSEMBLY__ |
| 60 | - | |
| 61 | - | |
| 62 | -typedef signed char s8; | |
| 63 | -typedef unsigned char u8; | |
| 64 | - | |
| 65 | -typedef signed short s16; | |
| 66 | -typedef unsigned short u16; | |
| 67 | - | |
| 68 | -typedef signed int s32; | |
| 69 | -typedef unsigned int u32; | |
| 70 | - | |
| 71 | -#ifndef __s390x__ | |
| 72 | -typedef signed long long s64; | |
| 73 | -typedef unsigned long long u64; | |
| 74 | -#else /* __s390x__ */ | |
| 75 | -typedef signed long s64; | |
| 76 | -typedef unsigned long u64; | |
| 77 | -#endif /* __s390x__ */ | |
| 78 | 42 | |
| 79 | 43 | typedef u32 dma_addr_t; |
| 80 | 44 |