Commit ba6677886e46adcd075f251d8971debf7b5ca3ee
1 parent
59df83992b
Exists in
master
and in
7 other branches
sh: types: use <asm-generic/int-*.h> for the sh architecture
This modifies <asm-sh/types.h> to use the <asm-generic/int-*.h> generic include files. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Paul Mundt <lethal@linux-sh.org>
Showing 1 changed file with 2 additions and 32 deletions Side-by-side Diff
include/asm-sh/types.h
| 1 | 1 | #ifndef __ASM_SH_TYPES_H |
| 2 | 2 | #define __ASM_SH_TYPES_H |
| 3 | 3 | |
| 4 | +#include <asm-generic/int-ll64.h> | |
| 5 | + | |
| 4 | 6 | #ifndef __ASSEMBLY__ |
| 5 | 7 | |
| 6 | 8 | typedef unsigned short umode_t; |
| 7 | 9 | |
| 8 | -/* | |
| 9 | - * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the | |
| 10 | - * header files exported to user space | |
| 11 | - */ | |
| 12 | - | |
| 13 | -typedef __signed__ char __s8; | |
| 14 | -typedef unsigned char __u8; | |
| 15 | - | |
| 16 | -typedef __signed__ short __s16; | |
| 17 | -typedef unsigned short __u16; | |
| 18 | - | |
| 19 | -typedef __signed__ int __s32; | |
| 20 | -typedef unsigned int __u32; | |
| 21 | - | |
| 22 | -#if defined(__GNUC__) | |
| 23 | -__extension__ typedef __signed__ long long __s64; | |
| 24 | -__extension__ typedef unsigned long long __u64; | |
| 25 | -#endif | |
| 26 | - | |
| 27 | 10 | #endif /* __ASSEMBLY__ */ |
| 28 | 11 | |
| 29 | 12 | /* |
| ... | ... | @@ -34,19 +17,6 @@ |
| 34 | 17 | #define BITS_PER_LONG 32 |
| 35 | 18 | |
| 36 | 19 | #ifndef __ASSEMBLY__ |
| 37 | - | |
| 38 | - | |
| 39 | -typedef __signed__ char s8; | |
| 40 | -typedef unsigned char u8; | |
| 41 | - | |
| 42 | -typedef __signed__ short s16; | |
| 43 | -typedef unsigned short u16; | |
| 44 | - | |
| 45 | -typedef __signed__ int s32; | |
| 46 | -typedef unsigned int u32; | |
| 47 | - | |
| 48 | -typedef __signed__ long long s64; | |
| 49 | -typedef unsigned long long u64; | |
| 50 | 20 | |
| 51 | 21 | /* Dma addresses are 32-bits wide. */ |
| 52 | 22 |