From 826ed892a277dd12980ac438b6d9d31ca7e1823f Mon Sep 17 00:00:00 2001
From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Sat, 11 Aug 2007 10:15:30 +1000
Subject: [PATCH] --- yaml --- r: 67215 b: refs/heads/master c:
 9f0cbea0d8cc47801b853d3c61d0e17475b0cc89 h: refs/heads/master i:   67213:
 14e2b4b5a19bf2f0225e9af5971a13a74f8d4833   67211:
 cdf03fbfd8e22a4856b45b435a4c0d2b541c0328   67207:
 107a078288032612e2c88f9797d4467f5514de9f   67199:
 3577b2fb41cbc084e924199ec5fce5a0d5f1504f v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-powerpc/atomic.h | 34 ++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9b79631090ad..614e08fee588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d4267eced79775399f256fbb4adb671e9b597e
+refs/heads/master: 9f0cbea0d8cc47801b853d3c61d0e17475b0cc89
diff --git a/trunk/include/asm-powerpc/atomic.h b/trunk/include/asm-powerpc/atomic.h
index c44810b9d322..f3fc733758f5 100644
--- a/trunk/include/asm-powerpc/atomic.h
+++ b/trunk/include/asm-powerpc/atomic.h
@@ -5,7 +5,7 @@
  * PowerPC atomic operations
  */
 
-typedef struct { volatile int counter; } atomic_t;
+typedef struct { int counter; } atomic_t;
 
 #ifdef __KERNEL__
 #include <linux/compiler.h>
@@ -15,8 +15,19 @@ typedef struct { volatile int counter; } atomic_t;
 
 #define ATOMIC_INIT(i)		{ (i) }
 
-#define atomic_read(v)		((v)->counter)
-#define atomic_set(v,i)		(((v)->counter) = (i))
+static __inline__ int atomic_read(const atomic_t *v)
+{
+	int t;
+
+	__asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
+
+	return t;
+}
+
+static __inline__ void atomic_set(atomic_t *v, int i)
+{
+	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
+}
 
 static __inline__ void atomic_add(int a, atomic_t *v)
 {
@@ -240,12 +251,23 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
 
 #ifdef __powerpc64__
 
-typedef struct { volatile long counter; } atomic64_t;
+typedef struct { long counter; } atomic64_t;
 
 #define ATOMIC64_INIT(i)	{ (i) }
 
-#define atomic64_read(v)	((v)->counter)
-#define atomic64_set(v,i)	(((v)->counter) = (i))
+static __inline__ long atomic64_read(const atomic64_t *v)
+{
+	long t;
+
+	__asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
+
+	return t;
+}
+
+static __inline__ void atomic64_set(atomic64_t *v, long i)
+{
+	__asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
+}
 
 static __inline__ void atomic64_add(long a, atomic64_t *v)
 {