summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2008-02-07 11:16:15 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 19:42:32 +0300
commitaebb77aef4b50a157bf0185de31d1aede3ca2312 (patch)
tree0f4b5f17120b93193d06dcf9f6ca270f2c06c5fc /include
parent14e0cb3c60b89c4a2512852ffc18601c72314a0f (diff)
downloadlinux-aebb77aef4b50a157bf0185de31d1aede3ca2312.tar.xz
Add cmpxchg_local to h8300
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: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-h8300/system.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index 2c1e83f7b419..4b8e475908ae 100644
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -138,6 +138,21 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
asm("jmp @@0"); \
})
+#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)
#endif /* _H8300_SYSTEM_H */