diff options
| author |   Pranith Kumar <bobby.prani@gmail.com> | 2014-04-15 12:05:22 -0400 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@linux.intel.com> | 2014-04-15 09:15:39 -0700 |
| commit | 73679e50820123ebdedc67ebcda4562d1d6e4aba (patch) | |
| tree | 831345b1237444e5d0bb48c66170dfdb0dd3f268 /include/linux/compiler-intel.h | |
| parent | Linux 3.15-rc1 (diff) | |
| download | linux-dev-73679e50820123ebdedc67ebcda4562d1d6e4aba.tar.xz linux-dev-73679e50820123ebdedc67ebcda4562d1d6e4aba.zip | |
compiler-intel.h: Remove duplicate definition
barrier is already defined as __memory_barrier in compiler.h
Remove this unnecessary redefinition.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Link: http://lkml.kernel.org/r/CAJhHMCAnYPy0%2BqD-1KBnJPLt3XgAjdR12j%2BySSnPgmZcpbE7HQ@mail.gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/compiler-intel.h')
| -rw-r--r-- | include/linux/compiler-intel.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index 5529c5239421..ba147a1727e6 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -13,12 +13,9 @@ /* Intel ECC compiler doesn't support gcc specific asm stmts. * It uses intrinsics to do the equivalent things. */ -#undef barrier #undef RELOC_HIDE #undef OPTIMIZER_HIDE_VAR -#define barrier() __memory_barrier() - #define RELOC_HIDE(ptr, off) \ ({ unsigned long __ptr; \ __ptr = (unsigned long) (ptr); \ |