Skip to contentSkip to conversation

arch,hexagon: Convert smp_mb__*()

tip:locking/core tip-bot for Peter Zijlstra 1 participant 1 message Apr 18, 2014

Subsystems (3)
Atomic infrastructure Bitops API Qualcomm hexagon architecture
lore
Share & tools
lore

tip-bot for Peter Zijlstra

author merge bot
#0 lore raw
Commit-ID:  94cf42f823bc904305b0ee93a09bcd51ba380497
Gitweb:     http://git.kernel.org/tip/94cf42f823bc904305b0ee93a09bcd51ba380497
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Thu, 13 Mar 2014 19:00:36 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 18 Apr 2014 14:20:35 +0200

arch,hexagon: Convert smp_mb__*()

Hexagon uses asm-gemeric/barrier.h and its smp_mb() is barrier(). Therefore we can use the default implementation that uses smp_mb().

Signed-off-by Peter Zijlstra <[email protected]>
Acked-by Paul E. McKenney <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Cc Linus Torvalds <[email protected]>
Cc Richard Kuo <[email protected]>
Cc Vineet Gupta <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/hexagon/include/asm/atomic.h | 6 +-----
 arch/hexagon/include/asm/bitops.h | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)
arch/hexagon/include/asm/atomic.h +1 -5
index 17dc637..de916b1 100644
@@ -24,6 +24,7 @@
 
 #include <linux/types.h>
 #include <asm/cmpxchg.h>
+#include <asm/barrier.h>
 
 #define ATOMIC_INIT(i)		{ (i) }
 

@@ -176,9 +177,4 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 #define atomic_inc_return(v) (atomic_add_return(1, v))
 #define atomic_dec_return(v) (atomic_sub_return(1, v))
 
-#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()
-
 #endif
arch/hexagon/include/asm/bitops.h +1 -3
index 9b1e4af..5e4a59b 100644
@@ -25,12 +25,10 @@
 #include <linux/compiler.h>
 #include <asm/byteorder.h>
 #include <asm/atomic.h>
+#include <asm/barrier.h>
 
 #ifdef __KERNEL__
 
-#define smp_mb__before_clear_bit()	barrier()
-#define smp_mb__after_clear_bit()	barrier()
-
 /*
  * The offset calculations for these are based on BITS_PER_LONG == 32
  * (i.e. I get to shift by #5-2 (32 bits per long, 4 bytes per access),