[PATCH] fix scaled & unscaled cputime accounting

The utimescaled / stimescaled fields in the task structure and the
global cpustat should be set on all architectures. On s390 the calls
to account_user_time_scaled and account_system_time_scaled never have
been added. In addition system time that is accounted as guest time
to the user time of a process is accounted to the scaled system time
instead of the scaled user time.
To fix the bugs and to prevent future forgetfulness this patch merges
account_system_time_scaled into account_system_time and
account_user_time_scaled into account_user_time.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Michael Neuling <mikey@neuling.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 75a6e62ea973..07283aea2e56 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -50,12 +50,12 @@ void account_process_tick(struct task_struct *tsk, int user_tick)
         rcu_user_flag = cputime != 0;
         S390_lowcore.user_timer -= cputime << 12;
         S390_lowcore.steal_clock -= cputime << 12;
-        account_user_time(tsk, cputime);
+        account_user_time(tsk, cputime, cputime);
 
         cputime =  S390_lowcore.system_timer >> 12;
         S390_lowcore.system_timer -= cputime << 12;
         S390_lowcore.steal_clock -= cputime << 12;
-        account_system_time(tsk, HARDIRQ_OFFSET, cputime);
+        account_system_time(tsk, HARDIRQ_OFFSET, cputime, cputime);
 
         cputime = S390_lowcore.steal_clock;
         if ((__s64) cputime > 0) {
@@ -82,12 +82,12 @@ void account_vtime(struct task_struct *tsk)
         cputime = S390_lowcore.user_timer >> 12;
         S390_lowcore.user_timer -= cputime << 12;
         S390_lowcore.steal_clock -= cputime << 12;
-        account_user_time(tsk, cputime);
+        account_user_time(tsk, cputime, cputime);
 
         cputime =  S390_lowcore.system_timer >> 12;
         S390_lowcore.system_timer -= cputime << 12;
         S390_lowcore.steal_clock -= cputime << 12;
-        account_system_time(tsk, 0, cputime);
+        account_system_time(tsk, 0, cputime, cputime);
 }
 
 /*
@@ -107,7 +107,7 @@ void account_system_vtime(struct task_struct *tsk)
         cputime =  S390_lowcore.system_timer >> 12;
         S390_lowcore.system_timer -= cputime << 12;
         S390_lowcore.steal_clock -= cputime << 12;
-        account_system_time(tsk, 0, cputime);
+        account_system_time(tsk, 0, cputime, cputime);
 }
 EXPORT_SYMBOL_GPL(account_system_vtime);