Message ID | 20220819092446.980320-6-bigeasy@linutronix.de |
---|---|
State | New |
Headers | show |
Series | Backports to fix random core | expand |
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index af9d338103a9b..613139c7538eb 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1381,8 +1381,7 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head) fn = timer->function; data = timer->data; - if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) && - timer->flags & TIMER_IRQSAFE) { + if (timer->flags & TIMER_IRQSAFE) { raw_spin_unlock(&base->lock); call_timer_fn(timer, fn, data); base->running_timer = NULL;
Keep interrupts disabled across callback invocation for the TIMER_IRQSAFE as expected. This is required for the timer used by workqueue after the upcomming rework. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- kernel/time/timer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)