Merge branch 'master' into for-2.6.33

3 files changed, 17 insertions, 8 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index bf8b4ae7ff2d..e49e9e0c69fd 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -55,6 +55,7 @@ static void __init reset_tod_clock(void)
                 disabled_wait(0);
 
         sched_clock_base_cc = TOD_UNIX_EPOCH;
+        S390_lowcore.last_update_clock = sched_clock_base_cc;
 }
 
 #ifdef CONFIG_SHARED_KERNEL
@@ -167,6 +168,14 @@ static noinline __init void create_kernel_nss(void)
                 return;
         }
 
+        /* re-initialize cputime accounting. */
+        sched_clock_base_cc = get_clock();
+        S390_lowcore.last_update_clock = sched_clock_base_cc;
+        S390_lowcore.last_update_timer = 0x7fffffffffffffffULL;
+        S390_lowcore.user_timer = 0;
+        S390_lowcore.system_timer = 0;
+        asm volatile("SPT 0(%0)" : : "a" (&S390_lowcore.last_update_timer));
+
         /* re-setup boot command line with new ipl vm parms */
         ipl_update_parameters();
         setup_boot_command_line();
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index f43d2ee54464..48215d15762b 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -565,10 +565,10 @@ pgm_svcper:
         lh      %r7,0x8a                # get svc number from lowcore
         l       %r9,__LC_THREAD_INFO    # load pointer to thread_info struct
         TRACE_IRQS_OFF
-        l       %r1,__TI_task(%r9)
-        mvc     __THREAD_per+__PER_atmid(2,%r1),__LC_PER_ATMID
-        mvc     __THREAD_per+__PER_address(4,%r1),__LC_PER_ADDRESS
-        mvc     __THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID
+        l       %r8,__TI_task(%r9)
+        mvc     __THREAD_per+__PER_atmid(2,%r8),__LC_PER_ATMID
+        mvc     __THREAD_per+__PER_address(4,%r8),__LC_PER_ADDRESS
+        mvc     __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID
         oi      __TI_flags+3(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP
         TRACE_IRQS_ON
         stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index a6f7b20df616..9aff1d449b6e 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -543,10 +543,10 @@ pgm_svcper:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
         llgh    %r7,__LC_SVC_INT_CODE   # get svc number from lowcore
         lg      %r9,__LC_THREAD_INFO    # load pointer to thread_info struct
-        lg      %r1,__TI_task(%r9)
-        mvc     __THREAD_per+__PER_atmid(2,%r1),__LC_PER_ATMID
-        mvc     __THREAD_per+__PER_address(8,%r1),__LC_PER_ADDRESS
-        mvc     __THREAD_per+__PER_access_id(1,%r1),__LC_PER_ACCESS_ID
+        lg      %r8,__TI_task(%r9)
+        mvc     __THREAD_per+__PER_atmid(2,%r8),__LC_PER_ATMID
+        mvc     __THREAD_per+__PER_address(8,%r8),__LC_PER_ADDRESS
+        mvc     __THREAD_per+__PER_access_id(1,%r8),__LC_PER_ACCESS_ID
         oi      __TI_flags+7(%r9),_TIF_SINGLE_STEP # set TIF_SINGLE_STEP
         TRACE_IRQS_ON
         stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts