summaryrefslogtreecommitdiffstats
path: root/include/linux/compiler-intel.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/compiler-intel.h')
-rw-r--r--include/linux/compiler-intel.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index d8e636e560..58daccca90 100644
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -14,18 +14,31 @@
* 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); \
(typeof(ptr)) (__ptr + (off)); })
+/* This should act as an optimization barrier on var.
+ * Given that this compiler does not have inline assembly, a compiler barrier
+ * is the best we can do.
+ */
+#define OPTIMIZER_HIDE_VAR(var) barrier()
+
/* Intel ECC compiler doesn't support __builtin_types_compatible_p() */
#define __must_be_array(a) 0
#endif
-#define uninitialized_var(x) x
+#ifndef __HAVE_BUILTIN_BSWAP16__
+/* icc has this, but it's called _bswap16 */
+#define __HAVE_BUILTIN_BSWAP16__
+#define __builtin_bswap16 _bswap16
+#endif