Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / arch / s390 / kernel / vtime.c

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 9a6c95761ad21678c858ec5f35ea3b25c43a1aa5..6b246aadf311706849341dac2d0eafee293340f1 100644 (file)
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -136,8 +136,10 @@ static int do_account_vtime(struct task_struct *tsk, int hardirq_offset)
                user_scaled = (user_scaled * mult) / div;
                system_scaled = (system_scaled * mult) / div;
        }
-       account_user_time(tsk, user, user_scaled);
-       account_system_time(tsk, hardirq_offset, system, system_scaled);
+       account_user_time(tsk, user);
+       tsk->utimescaled += user_scaled;
+       account_system_time(tsk, hardirq_offset, system);
+       tsk->stimescaled += system_scaled;
 
        steal = S390_lowcore.steal_timer;
        if ((s64) steal > 0) {
@@ -196,7 +198,8 @@ void vtime_account_irq_enter(struct task_struct *tsk)
 
                system_scaled = (system_scaled * mult) / div;
        }
-       account_system_time(tsk, 0, system, system_scaled);
+       account_system_time(tsk, 0, system);
+       tsk->stimescaled += system_scaled;
 
        virt_timer_forward(system);
 }