The cputime code has a few places that do per_cpu(, smp_processor_id()).
Replace them with __get_cpu_var().
Signed-off-by: Anton Blanchard <an...@samba.org>
---
Index: linux-cpumask/arch/powerpc/include/asm/cputime.h
===================================================================
--- linux-cpumask.orig/arch/powerpc/include/asm/cputime.h 2010-01-13
08:57:32.634007010 +1100
+++ linux-cpumask/arch/powerpc/include/asm/cputime.h 2010-01-13
08:58:45.265253809 +1100
@@ -73,10 +73,9 @@ static inline unsigned long cputime_to_j
static inline cputime_t cputime_to_scaled(const cputime_t ct)
{
if (cpu_has_feature(CPU_FTR_SPURR) &&
- per_cpu(cputime_last_delta, smp_processor_id()))
- return ct *
- per_cpu(cputime_scaled_last_delta, smp_processor_id())/
- per_cpu(cputime_last_delta, smp_processor_id());
+ __get_cpu_var(cputime_last_delta))
+ return ct * __get_cpu_var(cputime_scaled_last_delta) /
+ __get_cpu_var(cputime_last_delta);
return ct;
}
Index: linux-cpumask/arch/powerpc/kernel/time.c
===================================================================
--- linux-cpumask.orig/arch/powerpc/kernel/time.c 2010-01-13
08:57:32.714003980 +1100
+++ linux-cpumask/arch/powerpc/kernel/time.c 2010-01-13 08:58:45.265253809
+1100
@@ -265,8 +265,8 @@ void account_system_vtime(struct task_st
account_system_time(tsk, 0, delta, deltascaled);
else
account_idle_time(delta);
- per_cpu(cputime_last_delta, smp_processor_id()) = delta;
- per_cpu(cputime_scaled_last_delta, smp_processor_id()) = deltascaled;
+ __get_cpu_var(cputime_last_delta) = delta;
+ __get_cpu_var(cputime_scaled_last_delta) = deltascaled;
local_irq_restore(flags);
}
EXPORT_SYMBOL_GPL(account_system_vtime);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
