diff options
| -rw-r--r-- | kernel/timer.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 889f8c9..03f4ddd 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1457,18 +1457,20 @@ void run_local_timers(void) * the timer softirq. */ #ifdef CONFIG_PREEMPT_RT_FULL + /* On RT, irq work runs from softirq */ + if (irq_work_needs_cpu()) { + raise_softirq(TIMER_SOFTIRQ); + return; + } + if (!spin_do_trylock(&base->lock)) { raise_softirq(TIMER_SOFTIRQ); return; } #endif - if (!base->active_timers) { -#ifdef CONFIG_PREEMPT_RT_FULL - /* On RT, irq work runs from softirq */ - if (!irq_work_needs_cpu()) -#endif - goto out; - } + + if (!base->active_timers) + goto out; /* Check whether the next pending timer has expired */ if (time_before_eq(base->next_timer, jiffies)) |