Commit 372b0ec2 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Paul E. McKenney
Browse files

rcu: Remove superfluous local variable in rcu_init_geometry() 



Local variable 'n' mimics 'nr_cpu_ids' while the both are
used within one function. There is no reason for 'n' to
exist whatsoever.

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 75cf15a4

kernel/rcu/tree.c

+7 −7
Original line number Diff line number Diff line
@@ -4083,7 +4083,6 @@ static void __init rcu_init_geometry(void) 
	ulong d;

	int i;

	int j;

	int n = nr_cpu_ids;

	int rcu_capacity[MAX_RCU_LVLS + 1];



	/*
@@ -4133,15 +4132,16 @@ static void __init rcu_init_geometry(void) 
	 * The tree must be able to accommodate the configured number of CPUs.

	 * If this limit is exceeded than we have a serious problem elsewhere.

	 */

	if (n > rcu_capacity[MAX_RCU_LVLS])

	if (nr_cpu_ids > rcu_capacity[MAX_RCU_LVLS])

		panic("rcu_init_geometry: rcu_capacity[] is too small");



	/* Calculate the number of rcu_nodes at each level of the tree. */

	for (i = 1; i <= MAX_RCU_LVLS; i++)

		if (n <= rcu_capacity[i]) {

			for (j = 0; j <= i; j++)

				num_rcu_lvl[j] =

					DIV_ROUND_UP(n, rcu_capacity[i - j]);

		if (nr_cpu_ids <= rcu_capacity[i]) {

			for (j = 0; j <= i; j++) {

				int cap = rcu_capacity[i - j];

				num_rcu_lvl[j] = DIV_ROUND_UP(nr_cpu_ids, cap);

			}

			rcu_num_lvls = i;

			for (j = i + 1; j <= MAX_RCU_LVLS; j++)

				num_rcu_lvl[j] = 0;
@@ -4152,7 +4152,7 @@ static void __init rcu_init_geometry(void) 
	rcu_num_nodes = 0;

	for (i = 0; i <= MAX_RCU_LVLS; i++)

		rcu_num_nodes += num_rcu_lvl[i];

	rcu_num_nodes -= n;

	rcu_num_nodes -= nr_cpu_ids;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE