diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-13 14:00:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:41 -0400 |
commit | c645073f7e4f073e1ebcd0f0d91652c4468b8364 (patch) | |
tree | 4defb973474190bb8364eec5d2bb42ecdd8bb32f /arch/powerpc/include/asm/atomic.h | |
parent | e4a65e9d395feee195f1219d708e9eb2a2d4b583 (diff) |
arch,powerpc: Convert smp_mb__*()
Powerpc allows reordering over its ll/sc implementation. Implement the
two new barriers as appropriate.
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-gg2ffgq32sjgy9b8lj6m3hsc@git.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-kernel@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/powerpc/include/asm/atomic.h')
-rw-r--r-- | arch/powerpc/include/asm/atomic.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index e3b1d41c89be..28992d012926 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
10 | #include <asm/cmpxchg.h> | 10 | #include <asm/cmpxchg.h> |
11 | #include <asm/barrier.h> | ||
11 | 12 | ||
12 | #define ATOMIC_INIT(i) { (i) } | 13 | #define ATOMIC_INIT(i) { (i) } |
13 | 14 | ||
@@ -270,11 +271,6 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v) | |||
270 | } | 271 | } |
271 | #define atomic_dec_if_positive atomic_dec_if_positive | 272 | #define atomic_dec_if_positive atomic_dec_if_positive |
272 | 273 | ||
273 | #define smp_mb__before_atomic_dec() smp_mb() | ||
274 | #define smp_mb__after_atomic_dec() smp_mb() | ||
275 | #define smp_mb__before_atomic_inc() smp_mb() | ||
276 | #define smp_mb__after_atomic_inc() smp_mb() | ||
277 | |||
278 | #ifdef __powerpc64__ | 274 | #ifdef __powerpc64__ |
279 | 275 | ||
280 | #define ATOMIC64_INIT(i) { (i) } | 276 | #define ATOMIC64_INIT(i) { (i) } |