diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 12:52:14 +0800 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /include/linux/compiler-intel.h | |
parent | intel powerclamp: support Knights Landing (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
download | linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz linux-dev-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.zip |
Merge branches 'release' and 'thermal-soc' of .git into next
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); \ |