compiler-intel.h: Remove duplicate definition
authorPranith Kumar <bobby.prani@gmail.com>
Tue, 15 Apr 2014 16:05:22 +0000 (12:05 -0400)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 15 Apr 2014 16:15:39 +0000 (09:15 -0700)
barrier is already defined as __memory_barrier in compiler.h
Remove this unnecessary redefinition.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Link: http://lkml.kernel.org/r/CAJhHMCAnYPy0%2BqD-1KBnJPLt3XgAjdR12j%2BySSnPgmZcpbE7HQ@mail.gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
include/linux/compiler-intel.h

index 5529c52..ba147a1 100644 (file)
 /* Intel ECC compiler doesn't support gcc specific asm stmts.
  * It uses intrinsics to do the equivalent things.
  */
-#undef barrier
 #undef RELOC_HIDE
 #undef OPTIMIZER_HIDE_VAR
 
-#define barrier() __memory_barrier()
-
 #define RELOC_HIDE(ptr, off)                                   \
   ({ unsigned long __ptr;                                      \
      __ptr = (unsigned long) (ptr);                            \