summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/types.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/types.h')
-rw-r--r--arch/x86/include/asm/types.h44
1 files changed, 4 insertions, 40 deletions
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index e57ae2c8cf..52a6e51fd4 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -1,6 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __ASM_I386_TYPES_H
#define __ASM_I386_TYPES_H
+#include <asm-generic/int-ll64.h>
+
#ifndef __ASSEMBLY__
#ifdef __x86_64__
@@ -18,46 +22,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