diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 18:07:00 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 18:07:00 +0100 |
| commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
| tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /arch/hexagon/include/asm/barrier.h | |
| parent | x86, boot: Use __attribute__((used)) to ensure videocard structs are emitted (diff) | |
| parent | Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.tar.xz linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.zip | |
Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
Bring in upstream merge of x86/kaslr for future patches.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/hexagon/include/asm/barrier.h')
| -rw-r--r-- | arch/hexagon/include/asm/barrier.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/hexagon/include/asm/barrier.h b/arch/hexagon/include/asm/barrier.h index 1041a8e70ce8..4e863daea25b 100644 --- a/arch/hexagon/include/asm/barrier.h +++ b/arch/hexagon/include/asm/barrier.h @@ -29,10 +29,6 @@ #define smp_read_barrier_depends() barrier() #define smp_wmb() barrier() #define smp_mb() barrier() -#define smp_mb__before_atomic_dec() barrier() -#define smp_mb__after_atomic_dec() barrier() -#define smp_mb__before_atomic_inc() barrier() -#define smp_mb__after_atomic_inc() barrier() /* Set a value and use a memory barrier. Used by the scheduler somewhere. */ #define set_mb(var, value) \ |