3 files changed, 15 insertions, 3 deletions

diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
index 6b47b2ede405..bf3fe719c7ce 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
@@ -39,6 +39,7 @@ bool irq_work_queue_on(struct irq_work *work, int cpu);
 #endif
 
 void irq_work_run(void);
+void irq_work_tick(void);
 void irq_work_sync(struct irq_work *work);
 
 #ifdef CONFIG_IRQ_WORK
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index e6bcbe756663..385b85aded19 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -115,8 +115,10 @@ bool irq_work_needs_cpu(void)
 
         raised = &__get_cpu_var(raised_list);
         lazy = &__get_cpu_var(lazy_list);
-        if (llist_empty(raised) && llist_empty(lazy))
-                return false;
+
+        if (llist_empty(raised) || arch_irq_work_has_interrupt())
+                if (llist_empty(lazy))
+                        return false;
 
         /* All work should have been flushed before going offline */
         WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
@@ -171,6 +173,15 @@ void irq_work_run(void)
 }
 EXPORT_SYMBOL_GPL(irq_work_run);
 
+void irq_work_tick(void)
+{
+        struct llist_head *raised = &__get_cpu_var(raised_list);
+
+        if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
+                irq_work_run_list(raised);
+        irq_work_run_list(&__get_cpu_var(lazy_list));
+}
+
 /*
  * Synchronize against the irq_work @entry, ensures the entry is not
  * currently in use.
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index aca5dfe2fa3d..9bbb8344ed3b 100644
--- 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);