diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 12:41:09 +0200 |
| commit | 99e711101c7822d9ddf39f16c026b97e16a9f517 (patch) | |
| tree | 97f9d3bc19a3595365e68115015e27f1d4e7009d /include/linux/compiler-intel.h | |
| parent | f1dc154f82595386cddcc7b980d8760474c3dd2d (diff) | |
| parent | 3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff) | |
Merge branch 'linus' into x86/cleanups, before applying dependent patch
Diffstat (limited to 'include/linux/compiler-intel.h')
| -rw-r--r-- | include/linux/compiler-intel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index ba147a1727e6..0c9a2f2c2802 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -13,9 +13,12 @@ /* Intel ECC compiler doesn't support gcc specific asm stmts. * It uses intrinsics to do the equivalent things. */ +#undef barrier_data #undef RELOC_HIDE #undef OPTIMIZER_HIDE_VAR +#define barrier_data(ptr) barrier() + #define RELOC_HIDE(ptr, off) \ ({ unsigned long __ptr; \ __ptr = (unsigned long) (ptr); \ |