Commit 66292405 authored by Paul E. McKenney's avatar Paul E. McKenney

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: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 9bae6592
...@@ -3734,30 +3734,26 @@ void rcu_scheduler_starting(void) ...@@ -3734,30 +3734,26 @@ void rcu_scheduler_starting(void)
* Compute the per-level fanout, either using the exact fanout specified * Compute the per-level fanout, either using the exact fanout specified
* or balancing the tree, depending on CONFIG_RCU_FANOUT_EXACT. * or balancing the tree, depending on CONFIG_RCU_FANOUT_EXACT.
*/ */
#ifdef CONFIG_RCU_FANOUT_EXACT
static void __init rcu_init_levelspread(struct rcu_state *rsp) static void __init rcu_init_levelspread(struct rcu_state *rsp)
{ {
int i; int i;
rsp->levelspread[rcu_num_lvls - 1] = rcu_fanout_leaf; if (IS_ENABLED(CONFIG_RCU_FANOUT_EXACT)) {
for (i = rcu_num_lvls - 2; i >= 0; i--) rsp->levelspread[rcu_num_lvls - 1] = rcu_fanout_leaf;
rsp->levelspread[i] = CONFIG_RCU_FANOUT; for (i = rcu_num_lvls - 2; i >= 0; i--)
} rsp->levelspread[i] = CONFIG_RCU_FANOUT;
#else /* #ifdef CONFIG_RCU_FANOUT_EXACT */ } else {
static void __init rcu_init_levelspread(struct rcu_state *rsp) int ccur;
{ int cprv;
int ccur;
int cprv; cprv = nr_cpu_ids;
int i; for (i = rcu_num_lvls - 1; i >= 0; i--) {
ccur = rsp->levelcnt[i];
cprv = nr_cpu_ids; rsp->levelspread[i] = (cprv + ccur - 1) / ccur;
for (i = rcu_num_lvls - 1; i >= 0; i--) { cprv = ccur;
ccur = rsp->levelcnt[i]; }
rsp->levelspread[i] = (cprv + ccur - 1) / ccur;
cprv = ccur;
} }
} }
#endif /* #else #ifdef CONFIG_RCU_FANOUT_EXACT */
/* /*
* Helper function for rcu_init() that initializes one rcu_state structure. * Helper function for rcu_init() that initializes one rcu_state structure.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment