r8169: prevent bit sign expansion error in mdio_write

[linux-2.6-omap-h63xx.git] / drivers / s390 / s390mach.h

diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index d9ea7ed2e46e9ceead16eab686ebdff3086ee8fe..d3ca4281a494affcf21bbd04d62ffe086a2915da 100644 (file)
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -90,15 +90,19 @@ 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;
 }
 
+#define ED_ETR_SYNC    12      /* External damage ETR sync check */
+#define ED_ETR_SWITCH  13      /* External damage ETR switch to local */
+
 #endif /* __s390mach */