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 CC: clameter@sgi.com --- include/asm-h8300/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: linux-2.6-lttng/include/asm-h8300/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-h8300/system.h 2007-10-31 18:06:31.000000000 -0400 +++ linux-2.6-lttng/include/asm-h8300/system.h 2007-10-31 18:07:30.000000000 -0400 @@ -139,6 +139,21 @@ static inline unsigned long __xchg(unsig asm("jmp @@0"); \ }) +#include + +/* + * 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 +#endif + #define arch_align_stack(x) (x) #endif /* _H8300_SYSTEM_H */ -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/