Make sure that at least cmpxchg64_local is available on all architectures to use for unsigned long long values. Signed-off-by: Mathieu Desnoyers CC: ralf@linux-mips.org CC linux-mips@linux-mips.org --- include/asm-mips/system.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) Index: linux-2.6-lttng/include/asm-mips/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-mips/system.h 2007-08-27 11:28:22.000000000 -0400 +++ linux-2.6-lttng/include/asm-mips/system.h 2007-08-27 11:38:09.000000000 -0400 @@ -407,13 +407,22 @@ static inline unsigned long __cmpxchg_u6 return retval; } +#define cmpxchg64 cmpxchg +#define cmpxchg64_local cmpxchg_local + #else + +#include + +#define cmpxchg64_local(ptr,o,n) __cmpxchg64_local_generic((ptr), (o), (n)) + extern unsigned long __cmpxchg_u64_unsupported_on_32bit_kernels( volatile int * m, unsigned long old, unsigned long new); #define __cmpxchg_u64 __cmpxchg_u64_unsupported_on_32bit_kernels extern unsigned long __cmpxchg_u64_local_unsupported_on_32bit_kernels( volatile int * m, unsigned long old, unsigned long new); #define __cmpxchg_u64_local __cmpxchg_u64_local_unsupported_on_32bit_kernels + #endif /* This function doesn't exist, so you'll get a linker error @@ -449,7 +458,6 @@ static inline unsigned long __cmpxchg_lo #define cmpxchg(ptr,old,new) \ ((__typeof__(*(ptr)))__cmpxchg((ptr), \ (unsigned long)(old), (unsigned long)(new),sizeof(*(ptr)))) - #define cmpxchg_local(ptr,old,new) \ ((__typeof__(*(ptr)))__cmpxchg_local((ptr), \ (unsigned long)(old), (unsigned long)(new),sizeof(*(ptr)))) -- 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/