Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

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

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 0a9e5d67547dda2f23b44a6d9d87a68fce72403f..b4a3e9e06ef244967b440057a1ee46b05bdb0def 100644 (file)
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -6,13 +6,13 @@
  */
 
 #include <linux/kernel_stat.h>
+#include <linux/cputime.h>
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/timex.h>
 #include <linux/types.h>
 #include <linux/time.h>
 
-#include <asm/cputime.h>
 #include <asm/vtimer.h>
 #include <asm/vtime.h>
 #include <asm/cpu_mf.h>
@@ -114,8 +114,8 @@ static void account_system_index_scaled(struct task_struct *p,
                                        cputime_t cputime, cputime_t scaled,
                                        enum cpu_usage_stat index)
 {
-       p->stimescaled += scaled;
-       account_system_index_time(p, cputime, index);
+       p->stimescaled += cputime_to_nsecs(scaled);
+       account_system_index_time(p, cputime_to_nsecs(cputime), index);
 }
 
 /*
@@ -166,13 +166,13 @@ static int do_account_vtime(struct task_struct *tsk)
 
        /* Push account value */
        if (user) {
-               account_user_time(tsk, user);
-               tsk->utimescaled += scale_vtime(user);
+               account_user_time(tsk, cputime_to_nsecs(user));
+               tsk->utimescaled += cputime_to_nsecs(scale_vtime(user));
        }
 
        if (guest) {
-               account_guest_time(tsk, guest);
-               tsk->utimescaled += scale_vtime(guest);
+               account_guest_time(tsk, cputime_to_nsecs(guest));
+               tsk->utimescaled += cputime_to_nsecs(scale_vtime(guest));
        }
 
        if (system)
@@ -188,7 +188,7 @@ static int do_account_vtime(struct task_struct *tsk)
        steal = S390_lowcore.steal_timer;
        if ((s64) steal > 0) {
                S390_lowcore.steal_timer = 0;
-               account_steal_time(steal);
+               account_steal_time(cputime_to_nsecs(steal));
        }
 
        return virt_timer_forward(user + guest + system + hardirq + softirq);