From: Rik van Riel <[email protected]> Add a cpu parameter to steal_account_process_tick, so it can be used to do CPU time accounting for another CPU.
Signed-off-by: Rik van Riel <[email protected]> --- kernel/sched/cputime.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 7df761cd6dfc..9717d86cf2ab 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -254,15 +254,15 @@ void account_idle_time(cputime_t cputime) cpustat[CPUTIME_IDLE] += (__force u64) cputime; } -static __always_inline bool steal_account_process_tick(void) +static __always_inline bool steal_account_process_tick(int cpu) { #ifdef CONFIG_PARAVIRT if (static_key_false(¶virt_steal_enabled)) { u64 steal; cputime_t steal_ct; - steal = paravirt_steal_clock(smp_processor_id()); - steal -= this_rq()->prev_steal_time; + steal = paravirt_steal_clock(cpu); + steal -= cpu_rq(cpu)->prev_steal_time; /* * cputime_t may be less precise than nsecs (eg: if it's @@ -270,7 +270,7 @@ static __always_inline bool steal_account_process_tick(void) * granularity and account the rest on the next rounds. */ steal_ct = nsecs_to_cputime(steal); - this_rq()->prev_steal_time += cputime_to_nsecs(steal_ct); + cpu_rq(cpu)->prev_steal_time += cputime_to_nsecs(steal_ct); account_steal_time(steal_ct); return steal_ct; @@ -345,7 +345,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int cpu, u64 cputime = (__force u64) cputime_one_jiffy; u64 *cpustat = kstat->cpustat; - if (steal_account_process_tick()) + if (steal_account_process_tick(cpu)) return; cputime *= ticks; @@ -483,7 +483,7 @@ void account_process_tick(struct task_struct *p, int user_tick) return; } - if (steal_account_process_tick()) + if (steal_account_process_tick(cpu)) return; if (user_tick) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
