aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-01-23 18:53:43 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:36:53 -0500
commit0c79a8e29b5fcbcbfd611daf9d500cfad8370fcf (patch)
treef100650ac41e26941d56dabeaec21d26bdad7f83 /include/asm-generic
parent34228d473efe764d4db7c0536375f0c993e6e06a (diff)
asm/types.h: Remove include/asm-generic/int-l64.h
Now all 64-bit architectures have been converted to int-ll64.h, we can remove int-l64.h in kernelspace. For backwards compatibility, alpha, ia64, mips64, and powerpc64 still use int-l64.h in userspace. This is the (reworked for UAPI) non-documentation part of more than two year old "asm/types.h: All architectures use int-ll64.h in kernelspace" (https://lkml.org/lkml/2011/8/13/104) Since <asm/types.h> (from include/uapi/asm-generic/types.h) is used for both kernel and user space, include/asm-generic/int-ll64.h cannot just become include/asm-generic/types.h, as Arnd suggested. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/int-l64.h49
1 files changed, 0 insertions, 49 deletions
diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
deleted file mode 100644
index 27d4ec0dfce0..000000000000
--- a/include/asm-generic/int-l64.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/*
2 * asm-generic/int-l64.h
3 *
4 * Integer declarations for architectures which use "long"
5 * for 64-bit types.
6 */
7#ifndef _ASM_GENERIC_INT_L64_H
8#define _ASM_GENERIC_INT_L64_H
9
10#include <uapi/asm-generic/int-l64.h>
11
12
13#ifndef __ASSEMBLY__
14
15typedef signed char s8;
16typedef unsigned char u8;
17
18typedef signed short s16;
19typedef unsigned short u16;
20
21typedef signed int s32;
22typedef unsigned int u32;
23
24typedef signed long s64;
25typedef unsigned long u64;
26
27#define S8_C(x) x
28#define U8_C(x) x ## U
29#define S16_C(x) x
30#define U16_C(x) x ## U
31#define S32_C(x) x
32#define U32_C(x) x ## U
33#define S64_C(x) x ## L
34#define U64_C(x) x ## UL
35
36#else /* __ASSEMBLY__ */
37
38#define S8_C(x) x
39#define U8_C(x) x
40#define S16_C(x) x
41#define U16_C(x) x
42#define S32_C(x) x
43#define U32_C(x) x
44#define S64_C(x) x
45#define U64_C(x) x
46
47#endif /* __ASSEMBLY__ */
48
49#endif /* _ASM_GENERIC_INT_L64_H */