Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61c03ddb authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 4ba525d1

arch/powerpc/include/asm/cputime.h

+3 −4
Original line number Diff line number Diff line
@@ -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)

{

	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;

}

arch/powerpc/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ void account_system_vtime(struct task_struct *tsk) 
		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);