aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPranith Kumar <bobby.prani@gmail.com>2014-04-15 12:05:22 -0400
committerMister Oyster <oysterized@gmail.com>2017-08-31 01:38:26 +0200
commit188c27f6ee46d274ad644503faaaed1248719659 (patch)
tree5340eb41dbb05d225cd77ff7082af33480aabd67 /include/linux
parent3f73d8a071e733a63c56a90c10f91aae5c3dfcc9 (diff)
compiler-intel.h: Remove duplicate definition
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/compiler-intel.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index 5529c5239..ba147a172 100644
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -13,12 +13,9 @@
/* 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); \