From: Mathieu Desnoyers Date: Thu, 7 Feb 2008 08:16:11 +0000 (-0800) Subject: Add cmpxchg_local to arm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=176393d4232a89aaf8745b0726f4d212a20103f1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Add cmpxchg_local to arm 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: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 28425c473e71..6335de9a2bb3 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -363,6 +363,21 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size extern void disable_hlt(void); extern void enable_hlt(void); +#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 + #endif /* __ASSEMBLY__ */ #define arch_align_stack(x) (x)