Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds
0c79a8e2 34228d47

+1 -51
-49
include/asm-generic/int-l64.h
··· 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 - 15 - typedef signed char s8; 16 - typedef unsigned char u8; 17 - 18 - typedef signed short s16; 19 - typedef unsigned short u16; 20 - 21 - typedef signed int s32; 22 - typedef unsigned int u32; 23 - 24 - typedef signed long s64; 25 - typedef 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 */
+1 -2
include/uapi/asm-generic/types.h
··· 1 1 #ifndef _ASM_GENERIC_TYPES_H 2 2 #define _ASM_GENERIC_TYPES_H 3 3 /* 4 - * int-ll64 is used practically everywhere now, 5 - * so use it as a reasonable default. 4 + * int-ll64 is used everywhere now. 6 5 */ 7 6 #include <asm-generic/int-ll64.h> 8 7