From 4fd465697cfca611082a481fa8e2b838275c0fd3 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: 83893 b: refs/heads/master c:
 14e0cb3c60b89c4a2512852ffc18601c72314a0f h: refs/heads/master i:   83891:
 01f3c91f4019b0811b53b8bc47a76d7467e26d7e v: v3

---
 [refs]                         |  2 +-
 trunk/include/asm-frv/system.h | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d57582638e79..10c8889912a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7732ba3abc5a53e7e1d93afd5a5a6ccf74f2ce53
+refs/heads/master: 14e0cb3c60b89c4a2512852ffc18601c72314a0f
diff --git a/trunk/include/asm-frv/system.h b/trunk/include/asm-frv/system.h
index 9f5663ba19f8..59be5443a68f 100644
--- a/trunk/include/asm-frv/system.h
+++ b/trunk/include/asm-frv/system.h
@@ -268,5 +268,29 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
 
 #endif
 
+#include <asm-generic/cmpxchg-local.h>
+
+static inline unsigned long __cmpxchg_local(volatile void *ptr,
+				      unsigned long old,
+				      unsigned long new, int size)
+{
+	switch (size) {
+	case 4:
+		return cmpxchg(ptr, old, new);
+	default:
+		return __cmpxchg_local_generic(ptr, old, new, size);
+	}
+
+	return old;
+}
+
+/*
+ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
+ * them available.
+ */
+#define cmpxchg_local(ptr, o, n)				  	\
+	((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o),	\
+			(unsigned long)(n), sizeof(*(ptr))))
+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
 
 #endif /* _ASM_SYSTEM_H */