3.18.18-rt16-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior 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 Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/