asm/types.h: Remove include/asm-generic/int-l64.h (0c79a8e2) · Commits · 戴 / test

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>

include/asm-generic/int-l64.h

deleted100644 → 0

+0 −49

Original line number	Original line	Diff line number	Diff line
	/*
	* asm-generic/int-l64.h
	*
	* Integer declarations for architectures which use "long"
	* for 64-bit types.
	*/
	#ifndef _ASM_GENERIC_INT_L64_H
	#define _ASM_GENERIC_INT_L64_H

	#include <uapi/asm-generic/int-l64.h>


	#ifndef __ASSEMBLY__

	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 s64;
	typedef unsigned long u64;

	#define S8_C(x) x
	#define U8_C(x) x ## U
	#define S16_C(x) x
	#define U16_C(x) x ## U
	#define S32_C(x) x
	#define U32_C(x) x ## U
	#define S64_C(x) x ## L
	#define U64_C(x) x ## UL

	#else /* __ASSEMBLY__ */

	#define S8_C(x) x
	#define U8_C(x) x
	#define S16_C(x) x
	#define U16_C(x) x
	#define S32_C(x) x
	#define U32_C(x) x
	#define S64_C(x) x
	#define U64_C(x) x

	#endif /* __ASSEMBLY__ */

	#endif /* _ASM_GENERIC_INT_L64_H */

include/uapi/asm-generic/types.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_GENERIC_TYPES_H		#ifndef _ASM_GENERIC_TYPES_H
	#define _ASM_GENERIC_TYPES_H		#define _ASM_GENERIC_TYPES_H
	/*		/*
	* int-ll64 is used practically everywhere now,		* int-ll64 is used everywhere now.
	* so use it as a reasonable default.
	*/		*/
	#include <asm-generic/int-ll64.h>		#include <asm-generic/int-ll64.h>

Admin message