diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-12 12:11:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 05:40:31 -0400 |
commit | 6ae11028a62b2f82ee283392a84f33da599a81e7 (patch) | |
tree | 7327c915221892ea1158018410f964db6303dcbb | |
parent | febdbfe8a91ce0d11939d4940b592eb0dba8d663 (diff) |
arch,alpha: Convert smp_mb__*() to the asm-generic primitives
The Alpha ll/sc primitives do not imply any sort of barrier; therefore
the smp_mb__{before,after} should be a full barrier. This is the
default from asm-generic/barrier.h and therefore just remove the
current definitions.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-iacwfd15lq3ta2v7jut747r7@git.kernel.org
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/alpha/include/asm/atomic.h | 5 | ||||
-rw-r--r-- | arch/alpha/include/asm/bitops.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index 78b03ef39f6f..ed60a1ee1ed3 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h | |||
@@ -292,9 +292,4 @@ static inline long atomic64_dec_if_positive(atomic64_t *v) | |||
292 | #define atomic_dec(v) atomic_sub(1,(v)) | 292 | #define atomic_dec(v) atomic_sub(1,(v)) |
293 | #define atomic64_dec(v) atomic64_sub(1,(v)) | 293 | #define atomic64_dec(v) atomic64_sub(1,(v)) |
294 | 294 | ||
295 | #define smp_mb__before_atomic_dec() smp_mb() | ||
296 | #define smp_mb__after_atomic_dec() smp_mb() | ||
297 | #define smp_mb__before_atomic_inc() smp_mb() | ||
298 | #define smp_mb__after_atomic_inc() smp_mb() | ||
299 | |||
300 | #endif /* _ALPHA_ATOMIC_H */ | 295 | #endif /* _ALPHA_ATOMIC_H */ |
diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h index a19ba5efea4c..4bdfbd444e63 100644 --- a/arch/alpha/include/asm/bitops.h +++ b/arch/alpha/include/asm/bitops.h | |||
@@ -53,9 +53,6 @@ __set_bit(unsigned long nr, volatile void * addr) | |||
53 | *m |= 1 << (nr & 31); | 53 | *m |= 1 << (nr & 31); |
54 | } | 54 | } |
55 | 55 | ||
56 | #define smp_mb__before_clear_bit() smp_mb() | ||
57 | #define smp_mb__after_clear_bit() smp_mb() | ||
58 | |||
59 | static inline void | 56 | static inline void |
60 | clear_bit(unsigned long nr, volatile void * addr) | 57 | clear_bit(unsigned long nr, volatile void * addr) |
61 | { | 58 | { |