From 4d32dec69a34f369ceddc88746eff7693feae7af Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Thu, 7 Feb 2008 00:16:14 -0800
Subject: [PATCH] --- yaml --- r: 83892 b: refs/heads/master c:
 7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-cris/system.h | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 58852fc1b0a9..d57582638e79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10b8827068377a11ed0e396248f7d02751fe5f17
+refs/heads/master: 7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53
diff --git a/trunk/include/asm-cris/system.h b/trunk/include/asm-cris/system.h
index fea0e8d57cb5..5bcfe5a10907 100644
--- a/trunk/include/asm-cris/system.h
+++ b/trunk/include/asm-cris/system.h
@@ -66,6 +66,21 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
   return x;
 }
 
+#include <asm-generic/cmpxchg-local.h>
+
+/*
+ * 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 <asm-generic/cmpxchg.h>
+#endif
+
 #define arch_align_stack(x) (x)
 
 void default_idle(void);