Commit edfa5cfa3dc5bfa95e6aa82a2b8904e7f6c35ed7
1 parent
a192da9afa
Exists in
master
and in
4 other branches
x86: types: use <asm-generic/int-*.h> for the x86 architecture
This modifies <asm-x86/types.h> to use the <asm-generic/int-*.h> generic include files. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de>
Showing 1 changed file with 2 additions and 36 deletions Side-by-side Diff
include/asm-x86/types.h
| 1 | 1 | #ifndef _ASM_X86_TYPES_H |
| 2 | 2 | #define _ASM_X86_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 | -#ifdef __i386__ | |
| 23 | -# ifdef __GNUC__ | |
| 24 | -__extension__ typedef __signed__ long long __s64; | |
| 25 | -__extension__ typedef unsigned long long __u64; | |
| 26 | -# endif | |
| 27 | -#else | |
| 28 | -typedef __signed__ long long __s64; | |
| 29 | -typedef unsigned long long __u64; | |
| 30 | -#endif | |
| 31 | - | |
| 32 | 10 | #endif /* __ASSEMBLY__ */ |
| 33 | 11 | |
| 34 | 12 | /* |
| ... | ... | @@ -43,18 +21,6 @@ |
| 43 | 21 | #endif |
| 44 | 22 | |
| 45 | 23 | #ifndef __ASSEMBLY__ |
| 46 | - | |
| 47 | -typedef signed char s8; | |
| 48 | -typedef unsigned char u8; | |
| 49 | - | |
| 50 | -typedef signed short s16; | |
| 51 | -typedef unsigned short u16; | |
| 52 | - | |
| 53 | -typedef signed int s32; | |
| 54 | -typedef unsigned int u32; | |
| 55 | - | |
| 56 | -typedef signed long long s64; | |
| 57 | -typedef unsigned long long u64; | |
| 58 | 24 | |
| 59 | 25 | typedef u64 dma64_addr_t; |
| 60 | 26 | #if defined(CONFIG_X86_64) || defined(CONFIG_HIGHMEM64G) |