diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-04-28 18:50:06 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-07-12 14:27:54 -0700 |
| commit | d43a5d32e125db1e34641922e52baaa4fee3510a (patch) | |
| tree | bf124dd3cf38a72ff0a4eb0ee1fde98cb4b3cfad /kernel/rcu/tree_plugin.h | |
| parent | 8aa670cdacc1820cb0597e4b4b413ef91ede2dd9 (diff) | |
| download | linux-d43a5d32e125db1e34641922e52baaa4fee3510a.tar.bz2 | |
rcu: Convert ->completedqs to ->gp_seq
This commit switches the quiescent-state no-backtracking checks from
->gpnum and ->completed to ->gp_seq.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu/tree_plugin.h')
| -rw-r--r-- | kernel/rcu/tree_plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index bc32e1f434a6..2a81d243521f 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -262,7 +262,7 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp) */ if (!rnp->gp_tasks && (blkd_state & RCU_GP_BLKD)) { rnp->gp_tasks = &t->rcu_node_entry; - WARN_ON_ONCE(rnp->completedqs == rnp->gpnum); + WARN_ON_ONCE(rnp->completedqs == rnp->gp_seq); } if (!rnp->exp_tasks && (blkd_state & RCU_EXP_BLKD)) rnp->exp_tasks = &t->rcu_node_entry; @@ -537,7 +537,7 @@ void rcu_read_unlock_special(struct task_struct *t) WARN_ON_ONCE(rnp != t->rcu_blocked_node); WARN_ON_ONCE(!rcu_is_leaf_node(rnp)); empty_norm = !rcu_preempt_blocked_readers_cgp(rnp); - WARN_ON_ONCE(rnp->completedqs == rnp->gpnum && + WARN_ON_ONCE(rnp->completedqs == rnp->gp_seq && (!empty_norm || rnp->qsmask)); empty_exp = sync_rcu_preempt_exp_done(rnp); smp_mb(); /* ensure expedited fastpath sees end of RCU c-s. */ |