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 12:15:39 -0400 |
commit | 73679e50820123ebdedc67ebcda4562d1d6e4aba (patch) | |
tree | 831345b1237444e5d0bb48c66170dfdb0dd3f268 | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
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>
-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 @@ | |||
13 | /* Intel ECC compiler doesn't support gcc specific asm stmts. | 13 | /* Intel ECC compiler doesn't support gcc specific asm stmts. |
14 | * It uses intrinsics to do the equivalent things. | 14 | * It uses intrinsics to do the equivalent things. |
15 | */ | 15 | */ |
16 | #undef barrier | ||
17 | #undef RELOC_HIDE | 16 | #undef RELOC_HIDE |
18 | #undef OPTIMIZER_HIDE_VAR | 17 | #undef OPTIMIZER_HIDE_VAR |
19 | 18 | ||
20 | #define barrier() __memory_barrier() | ||
21 | |||
22 | #define RELOC_HIDE(ptr, off) \ | 19 | #define RELOC_HIDE(ptr, off) \ |
23 | ({ unsigned long __ptr; \ | 20 | ({ unsigned long __ptr; \ |
24 | __ptr = (unsigned long) (ptr); \ | 21 | __ptr = (unsigned long) (ptr); \ |