[PATCH 3.2 133/185] x86, build, icc: Remove uninitialized_var()from compiler-intel.h

From: Ben Hutchings
Date: Sat Dec 28 2013 - 21:09:53 EST

3.2.54-rc1 review patch. If anyone has any objections, please let me know.


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>
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

-#define uninitialized_var(x) x

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/