Merge tag 'omap-for-v3.17/soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / kernel / delayacct.c

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index cf2e65dddb196c39381d935274881120217c014a..ef90b04d783f143be42cfbf6153545e64e39a6e4 100644 (file)
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -82,23 +82,19 @@ void __delayacct_blkio_end(void)
 
 int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
 {
-       s64 tmp;
-       unsigned long t1;
-       unsigned long long t2, t3;
-       unsigned long flags;
-       struct timespec ts;
        cputime_t utime, stime, stimescaled, utimescaled;
+       unsigned long long t2, t3;
+       unsigned long flags, t1;
+       s64 tmp;
 
-       tmp = (s64)d->cpu_run_real_total;
        task_cputime(tsk, &utime, &stime);
-       cputime_to_timespec(utime + stime, &ts);
-       tmp += timespec_to_ns(&ts);
+       tmp = (s64)d->cpu_run_real_total;
+       tmp += cputime_to_nsecs(utime + stime);
        d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp;
 
-       tmp = (s64)d->cpu_scaled_run_real_total;
        task_cputime_scaled(tsk, &utimescaled, &stimescaled);
-       cputime_to_timespec(utimescaled + stimescaled, &ts);
-       tmp += timespec_to_ns(&ts);
+       tmp = (s64)d->cpu_scaled_run_real_total;
+       tmp += cputime_to_nsecs(utimescaled + stimescaled);
        d->cpu_scaled_run_real_total =
                (tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;