Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / kernel / time / timer.c

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index aca5dfe2fa3de5df0738b6dc495b2e186483a593..9bbb8344ed3bf675c9605383c0614be37cc4ddb5 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1385,7 +1385,7 @@ void update_process_times(int user_tick)
        rcu_check_callbacks(cpu, user_tick);
 #ifdef CONFIG_IRQ_WORK
        if (in_irq())
-               irq_work_run();
+               irq_work_tick();
 #endif
        scheduler_tick();
        run_posix_cpu_timers(p);