Commit-ID:  6ae11028a62b2f82ee283392a84f33da599a81e7
Gitweb:     http://git.kernel.org/tip/6ae11028a62b2f82ee283392a84f33da599a81e7
Author:     Peter Zijlstra <pet...@infradead.org>
AuthorDate: Wed, 12 Mar 2014 17:11:00 +0100
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Fri, 18 Apr 2014 11:40:31 +0200

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 <pet...@infradead.org>
Acked-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-iacwfd15lq3ta2v7jut74...@git.kernel.org
Cc: Ivan Kokshaysky <i...@jurassic.park.msu.ru>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Matt Turner <matts...@gmail.com>
Cc: Richard Henderson <r...@twiddle.net>
Cc: linux-al...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/alpha/include/asm/atomic.h | 5 -----
 arch/alpha/include/asm/bitops.h | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
index 78b03ef..ed60a1e 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)
 #define atomic_dec(v) atomic_sub(1,(v))
 #define atomic64_dec(v) atomic64_sub(1,(v))
 
-#define smp_mb__before_atomic_dec()    smp_mb()
-#define smp_mb__after_atomic_dec()     smp_mb()
-#define smp_mb__before_atomic_inc()    smp_mb()
-#define smp_mb__after_atomic_inc()     smp_mb()
-
 #endif /* _ALPHA_ATOMIC_H */
diff --git a/arch/alpha/include/asm/bitops.h b/arch/alpha/include/asm/bitops.h
index a19ba5e..4bdfbd4 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)
        *m |= 1 << (nr & 31);
 }
 
-#define smp_mb__before_clear_bit()     smp_mb()
-#define smp_mb__after_clear_bit()      smp_mb()
-
 static inline void
 clear_bit(unsigned long nr, volatile void * addr)
 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to