From 1e87c3d7a79c94951a3bf626d386242a5ae68e0f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 7 Feb 2008 00:16:11 -0800 Subject: [PATCH] --- yaml --- r: 83889 b: refs/heads/master c: 176393d4232a89aaf8745b0726f4d212a20103f1 h: refs/heads/master i: 83887: bc918fbf32ab04a405d6e2d0b12dae313cdaf353 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/system.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 313cbb148f89..82ac77a05374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32f49eab5e893007c0064f465c857ac7c4d40b77 +refs/heads/master: 176393d4232a89aaf8745b0726f4d212a20103f1 diff --git a/trunk/include/asm-arm/system.h b/trunk/include/asm-arm/system.h index 28425c473e71..6335de9a2bb3 100644 --- a/trunk/include/asm-arm/system.h +++ b/trunk/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)