From 7acb10683a87725878670d30d92f6112ba70af35 Mon Sep 17 00:00:00 2001 From: Milton Miller Date: Fri, 14 Dec 2007 15:52:10 +1100 Subject: [PATCH] --- yaml --- r: 81097 b: refs/heads/master c: 8b5621f183f7e56958b0a0aae689af5af2efeda7 h: refs/heads/master i: 81095: ceb88087ffe11652139f189bba25053f5cb8dd35 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e872847a78c0..d0867015994e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c481887f2b74f87f714e2b76b8b834e57912bd0a +refs/heads/master: 8b5621f183f7e56958b0a0aae689af5af2efeda7 diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c index cc82fd675f91..888c65726ebd 100644 --- a/trunk/arch/powerpc/kernel/time.c +++ b/trunk/arch/powerpc/kernel/time.c @@ -327,7 +327,7 @@ void calculate_steal_time(void) if (!cpu_has_feature(CPU_FTR_PURR)) return; - pme = &per_cpu(cpu_purr_data, smp_processor_id()); + pme = &__get_cpu_var(cpu_purr_data); if (!pme->initialized) return; /* this can happen in early boot */ tb = mftb(); @@ -352,7 +352,7 @@ static void snapshot_purr(void) if (!cpu_has_feature(CPU_FTR_PURR)) return; local_irq_save(flags); - pme = &per_cpu(cpu_purr_data, smp_processor_id()); + pme = &__get_cpu_var(cpu_purr_data); pme->tb = mftb(); pme->purr = mfspr(SPRN_PURR); pme->initialized = 1;