Merge tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux

[pandora-kernel.git] / kernel / time / timer.c

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 3260ffd..2d3f5c5 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1377,12 +1377,11 @@ unsigned long get_next_timer_interrupt(unsigned long now)
 void update_process_times(int user_tick)
 {
        struct task_struct *p = current;
-       int cpu = smp_processor_id();
 
        /* Note: this timer irq context must be accounted for as well. */
        account_process_tick(p, user_tick);
        run_local_timers();
-       rcu_check_callbacks(cpu, user_tick);
+       rcu_check_callbacks(user_tick);
 #ifdef CONFIG_IRQ_WORK
        if (in_irq())
                irq_work_tick();