From 5e000e54ee77cff653b0cfa1669d2437580341a5 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Thu, 7 Feb 2008 00:16:12 -0800
Subject: [PATCH] --- yaml --- r: 83890 b: refs/heads/master c:
 5e86c11d3eb4662000f3ced7344352b2ca319d03 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 82ac77a05374..701809e39bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176393d4232a89aaf8745b0726f4d212a20103f1
+refs/heads/master: 5e86c11d3eb4662000f3ced7344352b2ca319d03
diff --git a/trunk/include/asm-avr32/system.h b/trunk/include/asm-avr32/system.h
index c600cc15cbcb..9702c2213e1e 100644
--- a/trunk/include/asm-avr32/system.h
+++ b/trunk/include/asm-avr32/system.h
@@ -145,6 +145,29 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 				   (unsigned long)(new),	\
 				   sizeof(*(ptr))))
 
+#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_u32(ptr, old, new);
+	default:
+		return __cmpxchg_local_generic(ptr, old, new, size);
+	}
+
+	return old;
+}
+
+#define cmpxchg_local(ptr, old, new)					\
+	((typeof(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(old),	\
+				   (unsigned long)(new),		\
+				   sizeof(*(ptr))))
+
+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+
 struct pt_regs;
 void NORET_TYPE die(const char *str, struct pt_regs *regs, long err);
 void _exception(long signr, struct pt_regs *regs, int code,