4.1.15-rt18-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior The upstream changes were: 6047967 ksoftirqd: Use new cond_resched_rcu_qs() function 28423ad ksoftirqd: Enable IRQs and call cond_resched() before poking RCU Reported-by: Grygorii Strashko Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt --- kernel/softirq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 0fd93311536f..f4c2e679a7d7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -599,8 +599,8 @@ static void run_ksoftirqd(unsigned int cpu) do_current_softirqs(); current->softirq_nestcnt--; - rcu_note_context_switch(); local_irq_enable(); + cond_resched_rcu_qs(); } /* -- 2.7.0