This is a note to let you know that I've just added the patch titled
x86, build, icc: Remove uninitialized_var() from compiler-intel.h
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-build-icc-remove-uninitialized_var-from-compiler-intel.h.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4fe644c42cb5980bfa920fdf9f1d1bc306328c52 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@xxxxxxxxxxxxxxx>
Date: Tue, 10 Dec 2013 14:56:06 -0800
Subject: x86, build, icc: Remove uninitialized_var() from compiler-intel.h
From: "H. Peter Anvin" <hpa@xxxxxxxxxxxxxxx>
commit 503cf95c061a0551eb684da364509297efbe55d9 upstream.
When compiling with icc, <linux/compiler-gcc.h> ends up included
because the icc environment defines __GNUC__. Thus, we neither need
nor want to have this macro defined in both compiler-gcc.h and
compiler-intel.h, and the fact that they are inconsistent just makes
the compiler spew warnings.
Reported-by: Sunil K. Pandey <sunil.k.pandey@xxxxxxxxx>
Cc: Kevin B. Smith <kevin.b.smith@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-0mbwou1zt7pafij09b897lg3@xxxxxxxxxxxxxx
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: Rui Xiang <rui.xiang@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/linux/compiler-intel.h | 2 --
1 file changed, 2 deletions(-)
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -27,5 +27,3 @@
#define __must_be_array(a) 0
#endif
-
-#define uninitialized_var(x) x
Patches currently in stable-queue which might be from hpa@xxxxxxxxxxxxxxx are
queue-3.4/x86-sandy-bridge-mark-arrays-in-__init-functions-as-__initconst.patch
queue-3.4/x86-64-modify_ldt-make-support-for-16-bit-segments-a-runtime-option.patch
queue-3.4/x86-fix-build-error-and-kconfig-for-ia32_emulation-and-binfmt.patch
queue-3.4/x86-build-icc-remove-uninitialized_var-from-compiler-intel.h.patch
queue-3.4/x86-build-pass-in-additional-mno-mmx-mno-sse-options.patch
queue-3.4/x86-mm-hugetlb-add-missing-tlb-page-invalidation-for-hugetlb_cow.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html