lkml.org 
[lkml]   [2015]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 05/24] rcu: Remove superfluous local variable in rcu_init_geometry()
    Date
    From: Alexander Gordeev <agordeev@redhat.com>

    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>
    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    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 f374f2caaf25..99431ca4d395 100644
    --- a/kernel/rcu/tree.c
    +++ b/kernel/rcu/tree.c
    @@ -4053,7 +4053,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];

    /*
    @@ -4096,7 +4095,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) {
    @@ -4106,10 +4105,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;
    @@ -4120,7 +4120,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.1.5


    \
     
     \ /
      Last update: 2015-05-13 00:41    [W:2.119 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site