summaryrefslogtreecommitdiff
path: root/include/linux/compiler-intel.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-29 16:34:15 (GMT)
committerTom Rini <trini@konsulko.com>2016-02-29 16:43:24 (GMT)
commit9b2c282b348dfe966bbba967dc7a45ce817cce50 (patch)
tree23bb42def3419f8d1e351dadda815edb2c42e05d /include/linux/compiler-intel.h
parent9902c113ade2c9af701785b982a1a4db4a2395ec (diff)
downloadu-boot-fsl-qoriq-9b2c282b348dfe966bbba967dc7a45ce817cce50.tar.xz
compiler*.h: sync include/linux/compiler*.h with Linux 4.5-rc6
Copy these from Linux v4.5-rc6 tag. This is needed so that we can keep up with newer gcc versions. Note that we don't have the uapi/ hierarchy from the kernel so continue to use <linux/types.h> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/linux/compiler-intel.h')
-rw-r--r--include/linux/compiler-intel.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index ba147a1..d4c7113 100644
--- 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); \