The patch titled include/linux/compiler-gcc*.h: unify macro definitions has been added to the -mm tree. Its filename is include-linux-compiler-gcch-unify-macro-definitions.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: include/linux/compiler-gcc*.h: unify macro definitions From: Borislav Petkov <borislav.petkov@xxxxxxx> Unify identical gcc3.x and gcc4.x macros. Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/compiler-gcc.h | 8 ++++++++ include/linux/compiler-gcc3.h | 8 -------- include/linux/compiler-gcc4.h | 8 -------- 3 files changed, 8 insertions(+), 16 deletions(-) diff -puN include/linux/compiler-gcc.h~include-linux-compiler-gcch-unify-macro-definitions include/linux/compiler-gcc.h --- a/include/linux/compiler-gcc.h~include-linux-compiler-gcch-unify-macro-definitions +++ a/include/linux/compiler-gcc.h @@ -92,3 +92,11 @@ #if !defined(__noclone) #define __noclone /* not needed */ #endif + +/* + * A trick to suppress uninitialized variable warning without generating any + * code + */ +#define uninitialized_var(x) x = x + +#define __always_inline inline __attribute__((always_inline)) diff -puN include/linux/compiler-gcc3.h~include-linux-compiler-gcch-unify-macro-definitions include/linux/compiler-gcc3.h --- a/include/linux/compiler-gcc3.h~include-linux-compiler-gcch-unify-macro-definitions +++ a/include/linux/compiler-gcc3.h @@ -21,11 +21,3 @@ # error "GCOV profiling support for gcc versions below 3.4 not included" # endif /* __GNUC_MINOR__ */ #endif /* CONFIG_GCOV_KERNEL */ - -/* - * A trick to suppress uninitialized variable warning without generating any - * code - */ -#define uninitialized_var(x) x = x - -#define __always_inline inline __attribute__((always_inline)) diff -puN include/linux/compiler-gcc4.h~include-linux-compiler-gcch-unify-macro-definitions include/linux/compiler-gcc4.h --- a/include/linux/compiler-gcc4.h~include-linux-compiler-gcch-unify-macro-definitions +++ a/include/linux/compiler-gcc4.h @@ -12,13 +12,6 @@ #define __used __attribute__((__used__)) #define __must_check __attribute__((warn_unused_result)) #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -#define __always_inline inline __attribute__((always_inline)) - -/* - * A trick to suppress uninitialized variable warning without generating any - * code - */ -#define uninitialized_var(x) x = x #if __GNUC_MINOR__ >= 3 /* Mark functions as cold. gcc will assume any path leading to a call @@ -53,7 +46,6 @@ #define __noclone __attribute__((__noclone__)) #endif - #endif #if __GNUC_MINOR__ > 0 _ Patches currently in -mm which might be from borislav.petkov@xxxxxxx are linux-next.patch include-linux-compiler-gcch-unify-macro-definitions.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