diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:43:13 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:43:13 +0100 |
| commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
| tree | 1876616290ff282b8a0814e2429d23e0104f3701 /drivers/s390/s390mach.h | |
| parent | Merge branch 'origin' (diff) | |
| parent | [PATCH] USB: Fix GPL markings on usb core functions. (diff) | |
| download | linux-b2faf597d93bdf5e2d12d93ea0815935a73f749e.tar.xz linux-b2faf597d93bdf5e2d12d93ea0815935a73f749e.zip | |
Merge branch 'origin'
Diffstat (limited to 'drivers/s390/s390mach.h')
| -rw-r--r-- | drivers/s390/s390mach.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h index d9ea7ed2e46e..7abb42a09ae2 100644 --- a/drivers/s390/s390mach.h +++ b/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 */ |