From bab82dabda6ae7b9a6c0c289b2394a11ed9d5d3c Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 15 Jan 2016 18:05:16 +0100
Subject: [PATCH 267/365] kernel/softirq: use cond_resched_rcu_qs() on -RT as
 well (run_ksoftirqd())

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 <grygorii.strashko@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 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.10.2

