summaryrefslogtreecommitdiffstats
path: root/arch/metag/include/asm/atomic.h
diff options
context:
space:
mode:
authorPeter Zijlstra2014-03-13 19:00:36 +0100
committerIngo Molnar2014-04-18 14:20:38 +0200
commit40074dece684fc61ab72cfc1689d564cba1c5f64 (patch)
treeeb37370f63886527763387fb675f556e399cf107 /arch/metag/include/asm/atomic.h
parentarch,m68k: Convert smp_mb__*() (diff)
downloadkernel-qcow2-linux-40074dece684fc61ab72cfc1689d564cba1c5f64.tar.gz
kernel-qcow2-linux-40074dece684fc61ab72cfc1689d564cba1c5f64.tar.xz
kernel-qcow2-linux-40074dece684fc61ab72cfc1689d564cba1c5f64.zip
arch,metag: Convert smp_mb__*()
Implement the new barriers; as per the old versions the metag atomic imply a full barrier. 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-dqnyo215kq38wi4xcxnbpjw3@git.kernel.org Cc: James Hogan <james.hogan@imgtec.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-kernel@vger.kernel.org Cc: linux-metag@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/metag/include/asm/atomic.h')
-rw-r--r--arch/metag/include/asm/atomic.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/metag/include/asm/atomic.h b/arch/metag/include/asm/atomic.h
index 307ecd2bd9a1..470e365f04ea 100644
--- a/arch/metag/include/asm/atomic.h
+++ b/arch/metag/include/asm/atomic.h
@@ -4,6 +4,7 @@
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/cmpxchg.h>
+#include <asm/barrier.h>
#if defined(CONFIG_METAG_ATOMICITY_IRQSOFF)
/* The simple UP case. */
@@ -39,11 +40,6 @@
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-#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
#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v)