3.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: "H. Peter Anvin" <h...@linux.intel.com> 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.pan...@intel.com> Cc: Kevin B. Smith <kevin.b.sm...@intel.com> Signed-off-by: H. Peter Anvin <h...@linux.intel.com> Link: http://lkml.kernel.org/n/tip-0mbwou1zt7pafij09b897...@git.kernel.org [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <b...@decadent.org.uk> Cc: Rui Xiang <rui.xi...@huawei.com> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
