aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2017-03-15 15:59:17 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2017-04-18 14:38:21 -0400
commit41f5c63178b7ca3d775638710b752b81b433fc86 (patch)
tree26bbb4733721c7f935ab295fe9157206b53cdaa6
parent2b34c43cc1671c59bad6dd1682ae3ee4f0919eb7 (diff)
rcu: Remove redundant levelcnt[] array from rcu_init_one()
The levelcnt[] array is identical to num_rcu_lvl[], so this commit removes levelcnt[]. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-rw-r--r--kernel/rcu/tree.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index df3527744af8..9397a6693d70 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3961,7 +3961,6 @@ static void __init rcu_init_one(struct rcu_state *rsp)
3961 static struct lock_class_key rcu_node_class[RCU_NUM_LVLS]; 3961 static struct lock_class_key rcu_node_class[RCU_NUM_LVLS];
3962 static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS]; 3962 static struct lock_class_key rcu_fqs_class[RCU_NUM_LVLS];
3963 3963
3964 int levelcnt[RCU_NUM_LVLS]; /* # nodes in each level. */
3965 int levelspread[RCU_NUM_LVLS]; /* kids/node in each level. */ 3964 int levelspread[RCU_NUM_LVLS]; /* kids/node in each level. */
3966 int cpustride = 1; 3965 int cpustride = 1;
3967 int i; 3966 int i;
@@ -3976,18 +3975,16 @@ static void __init rcu_init_one(struct rcu_state *rsp)
3976 3975
3977 /* Initialize the level-tracking arrays. */ 3976 /* Initialize the level-tracking arrays. */
3978 3977
3979 for (i = 0; i < rcu_num_lvls; i++)
3980 levelcnt[i] = num_rcu_lvl[i];
3981 for (i = 1; i < rcu_num_lvls; i++) 3978 for (i = 1; i < rcu_num_lvls; i++)
3982 rsp->level[i] = rsp->level[i - 1] + levelcnt[i - 1]; 3979 rsp->level[i] = rsp->level[i - 1] + num_rcu_lvl[i - 1];
3983 rcu_init_levelspread(levelspread, levelcnt); 3980 rcu_init_levelspread(levelspread, num_rcu_lvl);
3984 3981
3985 /* Initialize the elements themselves, starting from the leaves. */ 3982 /* Initialize the elements themselves, starting from the leaves. */
3986 3983
3987 for (i = rcu_num_lvls - 1; i >= 0; i--) { 3984 for (i = rcu_num_lvls - 1; i >= 0; i--) {
3988 cpustride *= levelspread[i]; 3985 cpustride *= levelspread[i];
3989 rnp = rsp->level[i]; 3986 rnp = rsp->level[i];
3990 for (j = 0; j < levelcnt[i]; j++, rnp++) { 3987 for (j = 0; j < num_rcu_lvl[i]; j++, rnp++) {
3991 raw_spin_lock_init(&ACCESS_PRIVATE(rnp, lock)); 3988 raw_spin_lock_init(&ACCESS_PRIVATE(rnp, lock));
3992 lockdep_set_class_and_name(&ACCESS_PRIVATE(rnp, lock), 3989 lockdep_set_class_and_name(&ACCESS_PRIVATE(rnp, lock),
3993 &rcu_node_class[i], buf[i]); 3990 &rcu_node_class[i], buf[i]);