Merge branch 'for-linus-v3.20' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / s390 / kernel / sclp.S

diff --git a/arch/s390/kernel/sclp.S b/arch/s390/kernel/sclp.S
index a41f2c99dcc85dbac9a2193960a6de63ce769120..7e77e03378f38f2e770e369982c92a1382e461b1 100644 (file)
--- a/arch/s390/kernel/sclp.S
+++ b/arch/s390/kernel/sclp.S
@@ -294,7 +294,8 @@ ENTRY(_sclp_print_early)
 #ifdef CONFIG_64BIT
        tm      LC_AR_MODE_ID,1
        jno     .Lesa3
-       lmh     %r6,%r15,96(%r15)               # store upper register halves
+       lgfr    %r2,%r2                         # sign extend return value
+       lmh     %r6,%r15,96(%r15)               # restore upper register halves
        ahi     %r15,80
 .Lesa3:
 #endif