summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/timer.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 0906351..ed9d3bd 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1462,8 +1462,13 @@ void run_local_timers(void)
return;
}
#endif
- if (!base->active_timers)
- goto out;
+ if (!base->active_timers) {
+#ifdef CONFIG_PREEMPT_RT_FULL
+ /* On RT, irq work runs from softirq */
+ if (!irq_work_needs_cpu())
+#endif
+ goto out;
+ }
/* Check whether the next pending timer has expired */
if (time_before_eq(base->next_timer, jiffies))