The following commit has been merged into the core/rcu branch of tip: Commit-ID: 00943a609d7ad0f08e58bc9c214f38b0ba163c88 Gitweb: https://git.kernel.org/tip/00943a609d7ad0f08e58bc9c214f38b0ba163c88 Author: Wei Yang <[email protected]> AuthorDate: Fri, 12 Jun 2020 10:07:52 +08:00 Committer: Paul E. McKenney <[email protected]> CommitterDate: Mon, 29 Jun 2020 11:58:51 -07:00
rcu: gp_max is protected by root rcu_node's lock Because gp_max is protected by root rcu_node's lock, this commit moves the gp_max definition to the region of the rcu_node structure containing fields protected by this lock. Signed-off-by: Wei Yang <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> --- kernel/rcu/tree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index 575745f..09ec93b 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h @@ -302,6 +302,8 @@ struct rcu_state { u8 boost ____cacheline_internodealigned_in_smp; /* Subject to priority boost. */ unsigned long gp_seq; /* Grace-period sequence #. */ + unsigned long gp_max; /* Maximum GP duration in */ + /* jiffies. */ struct task_struct *gp_kthread; /* Task for grace periods. */ struct swait_queue_head gp_wq; /* Where GP task waits. */ short gp_flags; /* Commands for GP task. */ @@ -347,8 +349,6 @@ struct rcu_state { /* a reluctant CPU. */ unsigned long n_force_qs_gpstart; /* Snapshot of n_force_qs at */ /* GP start. */ - unsigned long gp_max; /* Maximum GP duration in */ - /* jiffies. */ const char *name; /* Name of structure. */ char abbr; /* Abbreviated name. */
