From 56f97bdca9c025c878703fb6580c9f26de382fb6 Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Date: Wed, 1 Feb 2006 03:06:40 -0800
Subject: [PATCH] --- yaml --- r: 19447 b: refs/heads/master c:
 46d0d2c811c8e9dd5cffdc3a5c03d988eb5a2996 h: refs/heads/master i:   19445:
 6bc8a42f00936935869cbcc14ca08dd60aaf54da   19443:
 77a52c8575acf6fe4c18c296e0d11064d8f6cc3b   19439:
 e57bd878b00ddbd09601de95956ec57cf551985c v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/s390/s390mach.h | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4812fb8ace23..24bd2870a936 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1969fa46d95efcdb0b84c540eca10db99665148
+refs/heads/master: 46d0d2c811c8e9dd5cffdc3a5c03d988eb5a2996
diff --git a/trunk/drivers/s390/s390mach.h b/trunk/drivers/s390/s390mach.h
index d9ea7ed2e46e..7abb42a09ae2 100644
--- a/trunk/drivers/s390/s390mach.h
+++ b/trunk/drivers/s390/s390mach.h
@@ -90,15 +90,16 @@ struct crw {
 
 static inline int stcrw(struct crw *pcrw )
 {
-        int ccode;
+	int ccode;
 
-        __asm__ __volatile__(
-                "STCRW 0(%1)\n\t"
-                "IPM %0\n\t"
-                "SRL %0,28\n\t"
-                : "=d" (ccode) : "a" (pcrw)
-                : "cc", "1" );
-        return ccode;
+	__asm__ __volatile__(
+		"stcrw 0(%2)\n\t"
+		"ipm %0\n\t"
+		"srl %0,28\n\t"
+		: "=d" (ccode), "=m" (*pcrw)
+		: "a" (pcrw)
+		: "cc" );
+	return ccode;
 }
 
 #endif /* __s390mach */