Commit 68f6783d28316affcd2ce332d949e40e4c7416bd
Committed by
John Stultz
John Stultz
1 parent
9667a23db0
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
delayacct: Remove braindamaged type conversions
Converting cputime to timespec and timespec to nanoseconds makes no sense. Use cputime_to_ns() and be done with it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Showing 1 changed file with 7 additions and 11 deletions Side-by-side Diff
kernel/delayacct.c
| ... | ... | @@ -82,23 +82,19 @@ |
| 82 | 82 | |
| 83 | 83 | int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk) |
| 84 | 84 | { |
| 85 | - s64 tmp; | |
| 86 | - unsigned long t1; | |
| 87 | - unsigned long long t2, t3; | |
| 88 | - unsigned long flags; | |
| 89 | - struct timespec ts; | |
| 90 | 85 | cputime_t utime, stime, stimescaled, utimescaled; |
| 86 | + unsigned long long t2, t3; | |
| 87 | + unsigned long flags, t1; | |
| 88 | + s64 tmp; | |
| 91 | 89 | |
| 92 | - tmp = (s64)d->cpu_run_real_total; | |
| 93 | 90 | task_cputime(tsk, &utime, &stime); |
| 94 | - cputime_to_timespec(utime + stime, &ts); | |
| 95 | - tmp += timespec_to_ns(&ts); | |
| 91 | + tmp = (s64)d->cpu_run_real_total; | |
| 92 | + tmp += cputime_to_nsecs(utime + stime); | |
| 96 | 93 | d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp; |
| 97 | 94 | |
| 98 | - tmp = (s64)d->cpu_scaled_run_real_total; | |
| 99 | 95 | task_cputime_scaled(tsk, &utimescaled, &stimescaled); |
| 100 | - cputime_to_timespec(utimescaled + stimescaled, &ts); | |
| 101 | - tmp += timespec_to_ns(&ts); | |
| 96 | + tmp = (s64)d->cpu_scaled_run_real_total; | |
| 97 | + tmp += cputime_to_nsecs(utimescaled + stimescaled); | |
| 102 | 98 | d->cpu_scaled_run_real_total = |
| 103 | 99 | (tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp; |
| 104 | 100 |