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 CC: zippel@linux-m68k.org CC: linux-m68k@lists.linux-m68k.org --- include/asm-m68k/system.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) Index: linux-2.6-lttng/include/asm-m68k/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-m68k/system.h 2007-08-07 14:31:51.000000000 -0400 +++ linux-2.6-lttng/include/asm-m68k/system.h 2007-08-07 15:01:41.000000000 -0400 @@ -154,6 +154,10 @@ static inline unsigned long __xchg(unsig } #endif +#include + +#define cmpxchg64_local(ptr,o,n) __cmpxchg64_local_generic((ptr), (o), (n)) + /* * Atomic compare and exchange. Compare OLD with MEM, if identical, * store NEW in MEM. Return the initial value in MEM. Success is @@ -188,6 +192,23 @@ static inline unsigned long __cmpxchg(vo #define cmpxchg(ptr,o,n)\ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ (unsigned long)(n),sizeof(*(ptr)))) +#define cmpxchg_local(ptr,o,n)\ + ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ + (unsigned long)(n),sizeof(*(ptr)))) +#else + +/* + * 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))) + +#ifndef CONFIG_SMP +#include +#endif + #endif #define arch_align_stack(x) (x) -- 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/