compiler*.h: sync include/linux/compiler*.h with Linux 4.5-rc6

[karo-tx-uboot.git] / include / linux / compiler-intel.h

diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index ba147a1727e6d2fc22c7899fcb5830803c629f41..d4c71132d07f0bd03b22766310455b8c133b6070 100644 (file)
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -13,9 +13,14 @@
 /* Intel ECC compiler doesn't support gcc specific asm stmts.
  * It uses intrinsics to do the equivalent things.
  */
+#undef barrier
+#undef barrier_data
 #undef RELOC_HIDE
 #undef OPTIMIZER_HIDE_VAR
 
+#define barrier() __memory_barrier()
+#define barrier_data(ptr) barrier()
+
 #define RELOC_HIDE(ptr, off)                                   \
   ({ unsigned long __ptr;                                      \
      __ptr = (unsigned long) (ptr);                            \