---

yaml --- r: 154879 b: refs/heads/master c: 7d17e27 h: refs/heads/master i: 154877: 95b0d7b 154875: 2fb7a90 154871: 8c8aca2 154863: 3c92c07 154847: 15bb5ef 154815: b90abbb 154751: 5d4bc1d 154623: 0628d71 v: v3
git-mirror · Jul 3, 2009 · 2fa3b1b · 2fa3b1b
1 parent 90abdf8
commit 2fa3b1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fb11781a044552dded5342e1a78cf92a74683db
+refs/heads/master: 7d17e2763129ea307702fcdc91f6e9d114b65c2d
diff --git a/trunk/arch/parisc/include/asm/system.h b/trunk/arch/parisc/include/asm/system.h
@@ -168,8 +168,8 @@ static inline void set_eiem(unsigned long val)
 /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*.  */
 #define __ldcw(a) ({						\
 	unsigned __ret;						\
-	__asm__ __volatile__(__LDCW " 0(%1),%0"			\
-		: "=r" (__ret) : "r" (a));			\
+	__asm__ __volatile__(__LDCW " 0(%2),%0"			\
+		: "=r" (__ret), "+m" (*(a)) : "r" (a));		\
 	__ret;							\
 })