The following commit has been merged into the core/rcu branch of tip: Commit-ID: 7487ea07dfa9bd782a13469cab18973ea0ab8c57 Gitweb: https://git.kernel.org/tip/7487ea07dfa9bd782a13469cab18973ea0ab8c57 Author: Paul E. McKenney <[email protected]> AuthorDate: Thu, 18 Jun 2020 09:51:12 -07:00 Committer: Paul E. McKenney <[email protected]> CommitterDate: Mon, 24 Aug 2020 18:36:03 -07:00
rcu: Initialize at declaration time in rcu_exp_handler() This commit moves the initialization of the CONFIG_PREEMPT=n version of the rcu_exp_handler() function's rdp and rnp local variables into their respective declarations to save a couple lines of code. Signed-off-by: Paul E. McKenney <[email protected]> --- kernel/rcu/tree_exp.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index 1888c0e..8760b6e 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h @@ -732,11 +732,9 @@ static void rcu_exp_need_qs(void) /* Invoked on each online non-idle CPU for expedited quiescent state. */ static void rcu_exp_handler(void *unused) { - struct rcu_data *rdp; - struct rcu_node *rnp; + struct rcu_data *rdp = this_cpu_ptr(&rcu_data); + struct rcu_node *rnp = rdp->mynode; - rdp = this_cpu_ptr(&rcu_data); - rnp = rdp->mynode; if (!(READ_ONCE(rnp->expmask) & rdp->grpmask) || __this_cpu_read(rcu_data.cpu_no_qs.b.exp)) return;
