Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f6783d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by John Stultz
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 9667a23d

kernel/delayacct.c

+7 −11
Original line number Original line Diff line number Diff line
@@ -82,23 +82,19 @@ void __delayacct_blkio_end(void) 




int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)

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;

	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);

	task_cputime(tsk, &utime, &stime);

	cputime_to_timespec(utime + stime, &ts);

	tmp = (s64)d->cpu_run_real_total;

	tmp += timespec_to_ns(&ts);

	tmp += cputime_to_nsecs(utime + stime);

	d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp;

	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);

	task_cputime_scaled(tsk, &utimescaled, &stimescaled);

	cputime_to_timespec(utimescaled + stimescaled, &ts);

	tmp = (s64)d->cpu_scaled_run_real_total;

	tmp += timespec_to_ns(&ts);

	tmp += cputime_to_nsecs(utimescaled + stimescaled);

	d->cpu_scaled_run_real_total =

	d->cpu_scaled_run_real_total =

		(tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;

		(tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;