aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcu/tree.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-01-19 22:16:38 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-03-03 14:14:08 -0500
commit6629240575992a6f0d18c46f5160b34527b0e501 (patch)
treeacc32296f9923684962216a874fd2750aeeda333 /kernel/rcu/tree.c
parent9bae6592d7d74dbb409e0dd8004f13af8b8d569e (diff)
rcu: Use IS_ENABLED() to CONFIG_RCU_FANOUT_EXACT #ifdef
This commit uses IS_ENABLED() to remove the #ifdef from the rcu_init_levelspread() functions. No effect on executable code. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu/tree.c')
-rw-r--r--kernel/rcu/tree.c32
1 files changed, 14 insertions, 18 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 4e37c7fd9e29..35e1604f7e3e 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3734,30 +3734,26 @@ void rcu_scheduler_starting(void)
3734 * Compute the per-level fanout, either using the exact fanout specified 3734 * Compute the per-level fanout, either using the exact fanout specified
3735 * or balancing the tree, depending on CONFIG_RCU_FANOUT_EXACT. 3735 * or balancing the tree, depending on CONFIG_RCU_FANOUT_EXACT.
3736 */ 3736 */
3737#ifdef CONFIG_RCU_FANOUT_EXACT
3738static void __init rcu_init_levelspread(struct rcu_state *rsp) 3737static void __init rcu_init_levelspread(struct rcu_state *rsp)
3739{ 3738{
3740 int i; 3739 int i;
3741 3740
3742 rsp->levelspread[rcu_num_lvls - 1] = rcu_fanout_leaf; 3741 if (IS_ENABLED(CONFIG_RCU_FANOUT_EXACT)) {
3743 for (i = rcu_num_lvls - 2; i >= 0; i--) 3742 rsp->levelspread[rcu_num_lvls - 1] = rcu_fanout_leaf;
3744 rsp->levelspread[i] = CONFIG_RCU_FANOUT; 3743 for (i = rcu_num_lvls - 2; i >= 0; i--)
3745} 3744 rsp->levelspread[i] = CONFIG_RCU_FANOUT;
3746#else /* #ifdef CONFIG_RCU_FANOUT_EXACT */ 3745 } else {
3747static void __init rcu_init_levelspread(struct rcu_state *rsp) 3746 int ccur;
3748{ 3747 int cprv;
3749 int ccur; 3748
3750 int cprv; 3749 cprv = nr_cpu_ids;
3751 int i; 3750 for (i = rcu_num_lvls - 1; i >= 0; i--) {
3752 3751 ccur = rsp->levelcnt[i];
3753 cprv = nr_cpu_ids; 3752 rsp->levelspread[i] = (cprv + ccur - 1) / ccur;
3754 for (i = rcu_num_lvls - 1; i >= 0; i--) { 3753 cprv = ccur;
3755 ccur = rsp->levelcnt[i]; 3754 }
3756 rsp->levelspread[i] = (cprv + ccur - 1) / ccur;
3757 cprv = ccur;
3758 } 3755 }
3759} 3756}
3760#endif /* #else #ifdef CONFIG_RCU_FANOUT_EXACT */
3761 3757
3762/* 3758/*
3763 * Helper function for rcu_init() that initializes one rcu_state structure. 3759 * Helper function for rcu_init() that initializes one rcu_state structure.