1 files changed, 6 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 6c6093d67f30..1b16b9a3e49a 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -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);
@@ -575,6 +575,8 @@ void timer_interrupt(struct pt_regs * regs)
 
         trace_timer_interrupt_entry(regs);
 
+        __get_cpu_var(irq_stat).timer_irqs++;
+
         /* Ensure a positive value is written to the decrementer, or else
          * some CPUs will continuue to take decrementer exceptions */
         set_dec(DECREMENTER_MAX);
@@ -935,8 +937,8 @@ static void register_decrementer_clockevent(int cpu)
         *dec = decrementer_clockevent;
         dec->cpumask = cpumask_of(cpu);
 
-        printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",
-               dec->name, dec->mult, dec->shift, cpu);
+        printk_once(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",
+                    dec->name, dec->mult, dec->shift, cpu);
 
         clockevents_register_device(dec);
 }