diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2008-02-07 00:16:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 08:42:31 -0800 |
| commit | 7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53 (patch) | |
| tree | 0dec1b2b4457d0db2ccd04eab6999c3b84c711f7 | |
| parent | 10b8827068377a11ed0e396248f7d02751fe5f17 (diff) | |
| download | kernel_samsung_aries-7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53.zip kernel_samsung_aries-7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53.tar.gz kernel_samsung_aries-7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53.tar.bz2 | |
Add cmpxchg_local to cris
Use the new generic cmpxchg_local (disables interrupt). Also use the generic
cmpxchg as fallback if SMP is not set.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Mikael Starvik <starvik@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/asm-cris/system.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h index fea0e8d..5bcfe5a 100644 --- a/include/asm-cris/system.h +++ b/include/asm-cris/system.h @@ -66,6 +66,21 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz return x; } +#include <asm-generic/cmpxchg-local.h> + +/* + * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make + * them available. + */ +#define cmpxchg_local(ptr, o, n) \ + ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ + (unsigned long)(n), sizeof(*(ptr)))) +#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) + +#ifndef CONFIG_SMP +#include <asm-generic/cmpxchg.h> +#endif + #define arch_align_stack(x) (x) void default_idle(void); |