Commit dbf3da1c authored Jan 31, 2017 by Frederic Weisbecker Committed by Ingo Molnar Feb 01, 2017

delaycct: Convert obsolete cputime type to nsecs



Use the new nsec based cputime accessors as part of the whole cputime
conversion from cputime_t to nsecs.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1485832191-26889-14-git-send-email-fweisbec@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent d4bc42af

kernel/delayacct.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -82,19 +82,19 @@ void __delayacct_blkio_end(void)

		int __delayacct_add_tsk(struct taskstats d, struct task_struct tsk)
		{
		cputime_t utime, stime, stimescaled, utimescaled;
		u64 utime, stime, stimescaled, utimescaled;
		unsigned long long t2, t3;
		unsigned long flags, t1;
		s64 tmp;

		task_cputime_t(tsk, &utime, &stime);
		task_cputime(tsk, &utime, &stime);
		tmp = (s64)d->cpu_run_real_total;
		tmp += cputime_to_nsecs(utime + stime);
		tmp += utime + stime;
		d->cpu_run_real_total = (tmp < (s64)d->cpu_run_real_total) ? 0 : tmp;

		task_cputime_t_scaled(tsk, &utimescaled, &stimescaled);
		task_cputime_scaled(tsk, &utimescaled, &stimescaled);
		tmp = (s64)d->cpu_scaled_run_real_total;
		tmp += cputime_to_nsecs(utimescaled + stimescaled);
		tmp += utimescaled + stimescaled;
		d->cpu_scaled_run_real_total =
		(tmp < (s64)d->cpu_scaled_run_real_total) ? 0 : tmp;