Subject: + asm-typesh-remove-include-asm-generic-int-l64h.patch added to -mm tree To: geert@xxxxxxxxxxxxxx,arnd@xxxxxxxx,rdunlap@xxxxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 19 Nov 2013 14:26:57 -0800 The patch titled Subject: asm/types.h: Remove include/asm-generic/int-l64.h has been added to the -mm tree. Its filename is asm-typesh-remove-include-asm-generic-int-l64h.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/asm-typesh-remove-include-asm-generic-int-l64h.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/asm-typesh-remove-include-asm-generic-int-l64h.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxxx> Acked-by: Arnd Bergmann <arnd@xxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/int-l64.h | 49 ----------------------------- include/uapi/asm-generic/types.h | 3 - 2 files changed, 1 insertion(+), 51 deletions(-) diff -puN include/asm-generic/int-l64.h~asm-typesh-remove-include-asm-generic-int-l64h /dev/null --- a/include/asm-generic/int-l64.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 */ diff -puN include/uapi/asm-generic/types.h~asm-typesh-remove-include-asm-generic-int-l64h include/uapi/asm-generic/types.h --- a/include/uapi/asm-generic/types.h~asm-typesh-remove-include-asm-generic-int-l64h +++ a/include/uapi/asm-generic/types.h @@ -1,8 +1,7 @@ #ifndef _ASM_GENERIC_TYPES_H #define _ASM_GENERIC_TYPES_H /* - * int-ll64 is used practically everywhere now, - * so use it as a reasonable default. + * int-ll64 is used everywhere now. */ #include <asm-generic/int-ll64.h> _ Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch drivers-rtc-rtc-s5mc-fix-info-rtc-assignment.patch genirq-correct-fuzzy-and-fragile-irq_retval-definition.patch scsi-do-not-call-do_div-with-a-64-bit-divisor.patch asm-typesh-remove-include-asm-generic-int-l64h.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html