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

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

kernel/rcu/tree.c

+14 −18
Original line number Diff line number Diff line
@@ -3734,21 +3734,17 @@ void rcu_scheduler_starting(void) 
 * Compute the per-level fanout, either using the exact fanout specified

 * 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)

{

	int i;



	if (IS_ENABLED(CONFIG_RCU_FANOUT_EXACT)) {

		rsp->levelspread[rcu_num_lvls - 1] = rcu_fanout_leaf;

		for (i = rcu_num_lvls - 2; i >= 0; i--)

			rsp->levelspread[i] = CONFIG_RCU_FANOUT;

}

#else /* #ifdef CONFIG_RCU_FANOUT_EXACT */

static void __init rcu_init_levelspread(struct rcu_state *rsp)

{

	} else {

		int ccur;

		int cprv;

	int i;



		cprv = nr_cpu_ids;

		for (i = rcu_num_lvls - 1; i >= 0; i--) {
@@ -3757,7 +3753,7 @@ static void __init rcu_init_levelspread(struct rcu_state *rsp) 
			cprv = ccur;

		}

	}

#endif /* #else #ifdef CONFIG_RCU_FANOUT_EXACT */

}



/*

 * Helper function for rcu_init() that initializes one rcu_state structure.