hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: Replace per_cpu(, smp_processor_id()) with __get_cpu_var() 

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 <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2010-01-13 12:04:11 +00:00 committed by Benjamin Herrenschmidt
parent 4ba525d134
commit 61c03ddbdf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/include/asm/cputime.h
View File

@ -73,10 +73,9 @@ static inline unsigned long cputime_to_jiffies(const cputime_t ct)
static inline cputime_t cputime_to_scaled(const cputime_t ct) static inline cputime_t cputime_to_scaled(const cputime_t ct)
{ {
if (cpu_has_feature(CPU_FTR_SPURR) && if (cpu_has_feature(CPU_FTR_SPURR) &&
per_cpu(cputime_last_delta, smp_processor_id())) __get_cpu_var(cputime_last_delta))
return ct * return ct * __get_cpu_var(cputime_scaled_last_delta) /
per_cpu(cputime_scaled_last_delta, smp_processor_id())/ __get_cpu_var(cputime_last_delta);
per_cpu(cputime_last_delta, smp_processor_id());
return ct; return ct;
} }

4
arch/powerpc/kernel/time.c
View File

@ -265,8 +265,8 @@ void account_system_vtime(struct task_struct *tsk)
account_system_time(tsk, 0, delta, deltascaled); account_system_time(tsk, 0, delta, deltascaled);
else else
account_idle_time(delta); account_idle_time(delta);
per_cpu(cputime_last_delta, smp_processor_id()) = delta; __get_cpu_var(cputime_last_delta) = delta;
per_cpu(cputime_scaled_last_delta, smp_processor_id()) = deltascaled; __get_cpu_var(cputime_scaled_last_delta) = deltascaled;
local_irq_restore(flags); local_irq_restore(flags);
} }
EXPORT_SYMBOL_GPL(account_system_vtime); EXPORT_SYMBOL_GPL(account_system_vtime);