Skip to content

Commit 76ce2b3

Browse files
valschneiderNeeraj Upadhyay
authored andcommitted
rcu: Rename struct rcu_data .exp_dynticks_snap into .exp_watching_snap
The context_tracking.state RCU_DYNTICKS subvariable has been renamed to RCU_WATCHING, and the snapshot helpers are now prefix by "rcu_watching". Reflect that change into the storage variables for these snapshots. Signed-off-by: Valentin Schneider <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Signed-off-by: Neeraj Upadhyay <[email protected]>
1 parent 2dba223 commit 76ce2b3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

kernel/rcu/tree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ struct rcu_data {
215215
/* 4) rcu_barrier(), OOM callbacks, and expediting. */
216216
unsigned long barrier_seq_snap; /* Snap of rcu_state.barrier_sequence. */
217217
struct rcu_head barrier_head;
218-
int exp_dynticks_snap; /* Double-check need for IPI. */
218+
int exp_watching_snap; /* Double-check need for IPI. */
219219

220220
/* 5) Callback offloading. */
221221
#ifdef CONFIG_RCU_NOCB_CPU

kernel/rcu/tree_exp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static void __sync_rcu_exp_select_node_cpus(struct rcu_exp_work *rewp)
380380
if (rcu_watching_snap_in_eqs(snap))
381381
mask_ofl_test |= mask;
382382
else
383-
rdp->exp_dynticks_snap = snap;
383+
rdp->exp_watching_snap = snap;
384384
}
385385
}
386386
mask_ofl_ipi = rnp->expmask & ~mask_ofl_test;
@@ -400,7 +400,7 @@ static void __sync_rcu_exp_select_node_cpus(struct rcu_exp_work *rewp)
400400
unsigned long mask = rdp->grpmask;
401401

402402
retry_ipi:
403-
if (rcu_watching_snap_stopped_since(rdp, rdp->exp_dynticks_snap)) {
403+
if (rcu_watching_snap_stopped_since(rdp, rdp->exp_watching_snap)) {
404404
mask_ofl_test |= mask;
405405
continue;
406406
}

0 commit comments

Comments
 (0)