aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-01-14 13:20:26 -0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-01-14 13:20:26 -0800
commit60479676eb6e9913176d93ebad194e3dc167bc63 (patch)
tree14f773bcb7af0375940e81735396afe82942c7ab
parentksoftirqd: Enable IRQs and call cond_resched() before poking RCU (diff)
downloadlinux-dev-60479676eb6e9913176d93ebad194e3dc167bc63.tar.xz
linux-dev-60479676eb6e9913176d93ebad194e3dc167bc63.zip
ksoftirqd: Use new cond_resched_rcu_qs() function
Simplify run_ksoftirqd() by using the new cond_resched_rcu_qs() function that conditionally reschedules, but unconditionally supplies an RCU quiescent state. This commit is separate from the previous commit by Calvin Owens because Calvin's approach can be backported, while this commit cannot be. The reason that this commit cannot be backported is that cond_resched_rcu_qs() does not always provide the needed quiescent state in earlier kernels. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-rw-r--r--kernel/softirq.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index c497fcdf0d1e..8cdb98847c7b 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -657,12 +657,7 @@ static void run_ksoftirqd(unsigned int cpu)
*/
__do_softirq();
local_irq_enable();
- cond_resched();
-
- preempt_disable();
- rcu_note_context_switch();
- preempt_enable();
-
+ cond_resched_rcu_qs();
return;
}
local_irq_enable();