diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /arch/sh/include/asm/atomic.h | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'arch/sh/include/asm/atomic.h')
| -rw-r--r-- | arch/sh/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h index 6327ffbb1992..978b58efb1e9 100644 --- a/arch/sh/include/asm/atomic.h +++ b/arch/sh/include/asm/atomic.h | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | #define atomic_inc(v) atomic_add(1,(v)) | 45 | #define atomic_inc(v) atomic_add(1,(v)) |
| 46 | #define atomic_dec(v) atomic_sub(1,(v)) | 46 | #define atomic_dec(v) atomic_sub(1,(v)) |
| 47 | 47 | ||
| 48 | #ifndef CONFIG_GUSA_RB | 48 | #if !defined(CONFIG_GUSA_RB) && !defined(CONFIG_CPU_SH4A) |
| 49 | static inline int atomic_cmpxchg(atomic_t *v, int old, int new) | 49 | static inline int atomic_cmpxchg(atomic_t *v, int old, int new) |
| 50 | { | 50 | { |
| 51 | int ret; | 51 | int ret; |
| @@ -73,7 +73,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) | |||
| 73 | 73 | ||
| 74 | return ret != u; | 74 | return ret != u; |
| 75 | } | 75 | } |
| 76 | #endif | 76 | #endif /* !CONFIG_GUSA_RB && !CONFIG_CPU_SH4A */ |
| 77 | 77 | ||
| 78 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | 78 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) |
| 79 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | 79 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) |