From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753514AbbCIIgh (ORCPT ); Mon, 9 Mar 2015 04:36:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36132 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753269AbbCIIeZ (ORCPT ); Mon, 9 Mar 2015 04:34:25 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , "Paul E. McKenney" Subject: [PATCH 02/10] rcu: Remove superfluous local variable in rcu_init_geometry() Date: Mon, 9 Mar 2015 09:34:06 +0100 Message-Id: <75a07a95e33ebe6a8ff99416724500c039155aea.1425889432.git.agordeev@redhat.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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" Signed-off-by: Alexander Gordeev --- kernel/rcu/tree.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 9308ec9..4045163 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -4009,7 +4009,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]; /* @@ -4052,7 +4051,7 @@ static void __init rcu_init_geometry(void) * the rcu_node masks. Complain and fall back to the compile- * time values if these limits are exceeded. */ - 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"); else if (rcu_fanout_leaf < CONFIG_RCU_FANOUT_LEAF || rcu_fanout_leaf > sizeof(unsigned long) * 8) { @@ -4062,10 +4061,11 @@ static void __init rcu_init_geometry(void) /* 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; @@ -4076,7 +4076,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; } void __init rcu_init(void) -- 1.8.3.1