1 files changed, 13 insertions, 0 deletions

diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index c6fbde13971..84a105838e0 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -831,14 +831,27 @@ mcck_return:
         __CPUINIT
         .globl restart_int_handler
 restart_int_handler:
+        basr    %r1,0
+restart_base:
+        spt     restart_vtime-restart_base(%r1)
+        stck    __LC_LAST_UPDATE_CLOCK
+        mvc     __LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1)
+        mvc     __LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1)
         lg      %r15,__LC_SAVE_AREA+120 # load ksp
         lghi    %r10,__LC_CREGS_SAVE_AREA
         lctlg   %c0,%c15,0(%r10) # get new ctl regs
         lghi    %r10,__LC_AREGS_SAVE_AREA
         lam     %a0,%a15,0(%r10)
         lmg     %r6,%r15,__SF_GPRS(%r15) # load registers from clone
+        lg      %r1,__LC_THREAD_INFO
+        mvc     __LC_USER_TIMER(8),__TI_user_timer(%r1)
+        mvc     __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)
+        xc      __LC_STEAL_TIMER(8),__LC_STEAL_TIMER
         stosm   __SF_EMPTY(%r15),0x04   # now we can turn dat on
         jg      start_secondary
+        .align  8
+restart_vtime:
+        .long   0x7fffffff,0xffffffff
         .previous
 #else
 /*