diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-07-29 20:28:11 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-09-21 00:16:17 -0400 |
commit | f4ecea309d3e17ba5e90082308125ad23bd5701b (patch) | |
tree | bf7623bc786bc0c9709a17aac6b459e7b1d21656 /kernel/rcu/tree.c | |
parent | 19a5ecde086a6a5287978b12ae948fa691b197b7 (diff) |
rcu: Use rsp->expedited_wq instead of sync_rcu_preempt_exp_wq
Now that there is an ->expedited_wq waitqueue in each rcu_state structure,
there is no need for the sync_rcu_preempt_exp_wq global variable. This
commit therefore substitutes ->expedited_wq for sync_rcu_preempt_exp_wq.
It also initializes ->expedited_wq only once at boot instead of at the
start of each expedited grace period.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu/tree.c')
-rw-r--r-- | kernel/rcu/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 775d36cc0050..53d66ebb4811 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -3556,7 +3556,6 @@ void synchronize_sched_expedited(void) | |||
3556 | rcu_exp_gp_seq_start(rsp); | 3556 | rcu_exp_gp_seq_start(rsp); |
3557 | 3557 | ||
3558 | /* Stop each CPU that is online, non-idle, and not us. */ | 3558 | /* Stop each CPU that is online, non-idle, and not us. */ |
3559 | init_waitqueue_head(&rsp->expedited_wq); | ||
3560 | atomic_set(&rsp->expedited_need_qs, 1); /* Extra count avoids race. */ | 3559 | atomic_set(&rsp->expedited_need_qs, 1); /* Extra count avoids race. */ |
3561 | for_each_online_cpu(cpu) { | 3560 | for_each_online_cpu(cpu) { |
3562 | struct rcu_data *rdp = per_cpu_ptr(rsp->rda, cpu); | 3561 | struct rcu_data *rdp = per_cpu_ptr(rsp->rda, cpu); |
@@ -4179,6 +4178,7 @@ static void __init rcu_init_one(struct rcu_state *rsp, | |||
4179 | } | 4178 | } |
4180 | 4179 | ||
4181 | init_waitqueue_head(&rsp->gp_wq); | 4180 | init_waitqueue_head(&rsp->gp_wq); |
4181 | init_waitqueue_head(&rsp->expedited_wq); | ||
4182 | rnp = rsp->level[rcu_num_lvls - 1]; | 4182 | rnp = rsp->level[rcu_num_lvls - 1]; |
4183 | for_each_possible_cpu(i) { | 4183 | for_each_possible_cpu(i) { |
4184 | while (i > rnp->grphi) | 4184 | while (i > rnp->grphi) |