s390: make sie intercept independent of thread_info

HANDLE_SIE_INTERCEPT is called early, use supervisor state and
instruction address to decide if the reset of the PSW to sie_loop
is required.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 6b5ea904e997..570c29d9b31b 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -81,16 +81,16 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
 
         .macro  HANDLE_SIE_INTERCEPT scratch
 #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
-        tm      __TI_flags+6(%r12),_TIF_SIE>>8
-        jz      .+42
-        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
-        jz      .+8
-        .insn   s,0xb2800000,BASED(.Lhost_id)   # set host id
+        tmhh    %r8,0x0001              # interrupting from user ?
+        jnz     .+42
         lgr     \scratch,%r9
         slg     \scratch,BASED(.Lsie_loop)
         clg     \scratch,BASED(.Lsie_length)
-        jhe     .+10
+        jhe     .+22
         lg      %r9,BASED(.Lsie_loop)
+        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
+        jz      .+8
+        .insn   s,0xb2800000,BASED(.Lhost_id)   # set host id
 #endif
         .endm