x86, build, icc: Remove uninitialized_var() from compiler-intel.h

tip:x86/urgent tip-bot for H. Peter Anvin 1 participant 1 message Dec 10, 2013 Stable branch

Share & tools

tip-bot for H. Peter Anvin

author merge bot

2013-12-10 23:03 UTC #0 lore raw

Commit-ID:  503cf95c061a0551eb684da364509297efbe55d9
Gitweb:     http://git.kernel.org/tip/503cf95c061a0551eb684da364509297efbe55d9
Author:     H. Peter Anvin <[email protected]>
AuthorDate: Tue, 10 Dec 2013 14:56:06 -0800
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Tue, 10 Dec 2013 15:01:01 -0800

x86, build, icc: Remove uninitialized_var() from compiler-intel.h

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 <[email protected]>

Cc Kevin B. Smith <[email protected]>

Signed-off-by H. Peter Anvin <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Cc <[email protected]>

---
 include/linux/compiler-intel.h | 2 --
 1 file changed, 2 deletions(-)

include/linux/compiler-intel.h +0 -2

index 973ce10..dc1bd3d 100644
@@ -28,8 +28,6 @@
 
 #endif
 
-#define uninitialized_var(x) x
-
 #ifndef __HAVE_BUILTIN_BSWAP16__
 /* icc has this, but it's called _bswap16 */
 #define __HAVE_BUILTIN_BSWAP16__