s390/cputime: simplify account_system_index_scaled

The account_system_index_scaled gets two cputime values, a raw value
derived from CPU timer deltas and a scaled value. The scaled value
is always calculated from the raw value, the code can be simplified
by moving the scale_vtime call into account_system_index_scaled.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2017-05-12 15:31:38 +02:00
parent 6c386da799
commit b29e061bb7
1 changed files with 5 additions and 9 deletions

View File

@ -110,11 +110,10 @@ static inline u64 scale_vtime(u64 vtime)
return vtime; return vtime;
} }
static void account_system_index_scaled(struct task_struct *p, static void account_system_index_scaled(struct task_struct *p, u64 cputime,
u64 cputime, u64 scaled,
enum cpu_usage_stat index) enum cpu_usage_stat index)
{ {
p->stimescaled += cputime_to_nsecs(scaled); p->stimescaled += cputime_to_nsecs(scale_vtime(cputime));
account_system_index_time(p, cputime_to_nsecs(cputime), index); account_system_index_time(p, cputime_to_nsecs(cputime), index);
} }
@ -176,14 +175,11 @@ static int do_account_vtime(struct task_struct *tsk)
} }
if (system) if (system)
account_system_index_scaled(tsk, system, scale_vtime(system), account_system_index_scaled(tsk, system, CPUTIME_SYSTEM);
CPUTIME_SYSTEM);
if (hardirq) if (hardirq)
account_system_index_scaled(tsk, hardirq, scale_vtime(hardirq), account_system_index_scaled(tsk, hardirq, CPUTIME_IRQ);
CPUTIME_IRQ);
if (softirq) if (softirq)
account_system_index_scaled(tsk, softirq, scale_vtime(softirq), account_system_index_scaled(tsk, softirq, CPUTIME_SOFTIRQ);
CPUTIME_SOFTIRQ);
steal = S390_lowcore.steal_timer; steal = S390_lowcore.steal_timer;
if ((s64) steal > 0) { if ((s64) steal > 0) {