sched/cputime: Fix omitted ticks passed in parameter

fweisbec · Ingo Molnar · commit 26f2c75cd2cf · 2016-08-11T16:34:37.000+02:00
Commit: f9bcf1e ("sched/cputime: Fix steal time accounting") ... fixes a leak on steal time accounting but forgets to account the ticks passed in parameters, assuming there is only one to take into account. Let's consider that parameter back. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Wanpeng Li <kernellwp@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Radim <rkrcmar@redhat.com> Cc: Rik van Riel <riel@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wanpeng Li <wanpeng.li@hotmail.com> Cc: linux-tip-commits@vger.kernel.org Link: http://lkml.kernel.org/r/20160811125822.GB4214@lerouge Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
@@ -509,12 +509,13 @@ void account_process_tick(struct task_struct *p, int user_tick)
 void account_idle_ticks(unsigned long ticks)
 {
 	cputime_t cputime, steal;
+
 	if (sched_clock_irqtime) {
 		irqtime_account_idle_ticks(ticks);
 		return;
 	}
 
-	cputime = cputime_one_jiffy;
+	cputime = jiffies_to_cputime(ticks);
 	steal = steal_account_process_time(cputime);
 
 	if (steal >= cputime)

Original file line number	Diff line number	Diff line change
`@@ -509,12 +509,13 @@ void account_process_tick(struct task_struct *p, int user_tick)`
`509`	`509`	`void account_idle_ticks(unsigned long ticks)`
`510`	`510`	`{`
`511`	`511`	`cputime_t cputime, steal;`
	`512`	`+`
`512`	`513`	`if (sched_clock_irqtime) {`
`513`	`514`	`irqtime_account_idle_ticks(ticks);`
`514`	`515`	`return;`
`515`	`516`	`}`
`516`	`517`
`517`		`- cputime = cputime_one_jiffy;`
	`518`	`+ cputime = jiffies_to_cputime(ticks);`
`518`	`519`	`steal = steal_account_process_time(cputime);`
`519`	`520`
`520`	`521`	`if (steal >= cputime)`