diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:39 +0200 |
| commit | f8eaeee4571358afa5fb0d9e6374d095c7531c96 (patch) | |
| tree | 40e37b7eb56c4f6f43273c07b58f310e68cfc2a6 /arch/x86/include/asm/types.h | |
| parent | 91649f1065d735bb4bcc6bb1a8067e670dcbbead (diff) | |
| parent | 34d18aaa2a47522a8b607fb2e61c79f5b10ecb9a (diff) | |
| download | barebox-f8eaeee4571358afa5fb0d9e6374d095c7531c96.tar.gz barebox-f8eaeee4571358afa5fb0d9e6374d095c7531c96.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/x86/include/asm/types.h')
| -rw-r--r-- | arch/x86/include/asm/types.h | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index e57ae2c8cf..17947b2ff3 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -1,6 +1,8 @@ #ifndef __ASM_I386_TYPES_H #define __ASM_I386_TYPES_H +#include <asm-generic/int-ll64.h> + #ifndef __ASSEMBLY__ #ifdef __x86_64__ @@ -18,46 +20,6 @@ #endif -/* - * __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; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#endif - -/* - * These aren't exported outside the kernel to avoid name space clashes - */ -#ifdef __KERNEL__ - -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long long s64; -typedef unsigned long long u64; - -#include <asm/bitsperlong.h> - -#endif /* __KERNEL__ */ - #endif #endif |