[PATCH RT 6/7] kernel/irq_work: fix non RT case
From: Steven Rostedt <rostedt@goodmis.org>
Date: 2015-08-05 01:19:02
Also in:
lkml
Subsystem:
high-resolution timers, timer wheel, clockevents, the rest · Maintainers:
Anna-Maria Behnsen, Frederic Weisbecker, Thomas Gleixner, Linus Torvalds
3.18.18-rt16-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> After the deadlock fixed, the checked got somehow away and broke the non-RT case which could invoke IRQ-work from softirq context. Cc: stable-rt@vger.kernel.org Reported-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- kernel/time/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index a29ab1a17023..3a978d000fce 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c@@ -1452,7 +1452,8 @@ void update_process_times(int user_tick) rcu_check_callbacks(cpu, user_tick); #if defined(CONFIG_IRQ_WORK) && !defined(CONFIG_PREEMPT_RT_FULL) - irq_work_tick(); + if (in_irq()) + irq_work_tick(); #endif run_posix_cpu_timers(p); }
--
2.1.4