s390/sthyi: use register pair instead of register asm

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/kernel/sthyi.c b/arch/s390/kernel/sthyi.c
index 888cc2f..4d141e2 100644 (file)
--- a/arch/s390/kernel/sthyi.c
+++ b/arch/s390/kernel/sthyi.c
@@ -395,19 +395,18 @@ out:
 
 static int sthyi(u64 vaddr, u64 *rc)
 {
-       register u64 code asm("0") = 0;
-       register u64 addr asm("2") = vaddr;
-       register u64 rcode asm("3");
+       union register_pair r1 = { .even = 0, }; /* subcode */
+       union register_pair r2 = { .even = vaddr, };
        int cc;
 
        asm volatile(
-               ".insn   rre,0xB2560000,%[code],%[addr]\n"
+               ".insn   rre,0xB2560000,%[r1],%[r2]\n"
                "ipm     %[cc]\n"
                "srl     %[cc],28\n"
-               : [cc] "=d" (cc), "=d" (rcode)
-               : [code] "d" (code), [addr] "a" (addr)
+               : [cc] "=&d" (cc), [r2] "+&d" (r2.pair)
+               : [r1] "d" (r1.pair)
                : "memory", "cc");
-       *rc = rcode;
+       *rc = r2.odd;
        return cc;
 }