From 7089024cc7da0ae5faae25ce4ecff98046fa294a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sun, 18 Oct 2009 15:36:02 +0900 Subject: [PATCH] --- yaml --- r: 173419 b: refs/heads/master c: 1c8db713e21c82e14d0d1be14a09dae224472396 h: refs/heads/master i: 173417: 7c0529f3a9494c1d683dbe138c402d2d7b814d09 173415: 5aa0cda97550de52915bd2b6de4aacadceff208b v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/atomic.h | 9 ++++----- trunk/arch/sh/include/asm/bitops.h | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5ed334302738..384ed7fde960 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15dfdddbf0c2be680d5d2fe2bbe3aad3dba3cf0e +refs/heads/master: 1c8db713e21c82e14d0d1be14a09dae224472396 diff --git a/trunk/arch/sh/include/asm/atomic.h b/trunk/arch/sh/include/asm/atomic.h index e8e78137c6f5..b16388d71954 100644 --- a/trunk/arch/sh/include/asm/atomic.h +++ b/trunk/arch/sh/include/asm/atomic.h @@ -78,11 +78,10 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -/* Atomic operations are already serializing on SH */ -#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() +#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() #include #include diff --git a/trunk/arch/sh/include/asm/bitops.h b/trunk/arch/sh/include/asm/bitops.h index ebe595b7ab1f..98511e4d28cb 100644 --- a/trunk/arch/sh/include/asm/bitops.h +++ b/trunk/arch/sh/include/asm/bitops.h @@ -26,8 +26,8 @@ /* * clear_bit() doesn't provide any barrier for the compiler. */ -#define smp_mb__before_clear_bit() barrier() -#define smp_mb__after_clear_bit() barrier() +#define smp_mb__before_clear_bit() smp_mb() +#define smp_mb__after_clear_bit() smp_mb() #ifdef CONFIG_SUPERH32 static inline unsigned long ffz(unsigned long word)