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

rcu: Use IS_ENABLED() to simplify rcu_bootup_announce_oddness() 



This commit gets rid of some inline #ifdefs by replacing them with
IS_ENABLED.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent d24209bb

kernel/rcu/tree_plugin.h

+20 −28
Original line number Original line Diff line number Diff line
@@ -58,38 +58,30 @@ static bool __read_mostly rcu_nocb_poll; /* Offload kthread are to poll. */ 
 */

 */

static void __init rcu_bootup_announce_oddness(void)

static void __init rcu_bootup_announce_oddness(void)

{

{

#ifdef CONFIG_RCU_TRACE

	if (IS_ENABLED(CONFIG_RCU_TRACE))

		pr_info("\tRCU debugfs-based tracing is enabled.\n");

		pr_info("\tRCU debugfs-based tracing is enabled.\n");

#endif

	if ((IS_ENABLED(CONFIG_64BIT) && CONFIG_RCU_FANOUT != 64) ||

#if (defined(CONFIG_64BIT) && CONFIG_RCU_FANOUT != 64) || (!defined(CONFIG_64BIT) && CONFIG_RCU_FANOUT != 32)

	    (!IS_ENABLED(CONFIG_64BIT) && CONFIG_RCU_FANOUT != 32))

		pr_info("\tCONFIG_RCU_FANOUT set to non-default value of %d\n",

		pr_info("\tCONFIG_RCU_FANOUT set to non-default value of %d\n",

		       CONFIG_RCU_FANOUT);

		       CONFIG_RCU_FANOUT);

#endif

	if (IS_ENABLED(CONFIG_RCU_FANOUT_EXACT))

#ifdef CONFIG_RCU_FANOUT_EXACT

		pr_info("\tHierarchical RCU autobalancing is disabled.\n");

		pr_info("\tHierarchical RCU autobalancing is disabled.\n");

#endif

	if (IS_ENABLED(CONFIG_RCU_FAST_NO_HZ))

#ifdef CONFIG_RCU_FAST_NO_HZ

		pr_info("\tRCU dyntick-idle grace-period acceleration is enabled.\n");

		pr_info("\tRCU dyntick-idle grace-period acceleration is enabled.\n");

#endif

	if (IS_ENABLED(CONFIG_PROVE_RCU))

#ifdef CONFIG_PROVE_RCU

		pr_info("\tRCU lockdep checking is enabled.\n");

		pr_info("\tRCU lockdep checking is enabled.\n");

#endif

	if (IS_ENABLED(CONFIG_RCU_TORTURE_TEST_RUNNABLE))

#ifdef CONFIG_RCU_TORTURE_TEST_RUNNABLE

		pr_info("\tRCU torture testing starts during boot.\n");

		pr_info("\tRCU torture testing starts during boot.\n");

#endif

	if (IS_ENABLED(CONFIG_RCU_CPU_STALL_INFO))

#if defined(CONFIG_RCU_CPU_STALL_INFO)

		pr_info("\tAdditional per-CPU info printed with stalls.\n");

		pr_info("\tAdditional per-CPU info printed with stalls.\n");

#endif

	if (NUM_RCU_LVL_4 != 0)

#if NUM_RCU_LVL_4 != 0

		pr_info("\tFour-level hierarchy is enabled.\n");

		pr_info("\tFour-level hierarchy is enabled.\n");

#endif

	if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF)

	if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF)

		pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf);

		pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf);

	if (nr_cpu_ids != NR_CPUS)

	if (nr_cpu_ids != NR_CPUS)

		pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids);

		pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids);

#ifdef CONFIG_RCU_BOOST

	if (IS_ENABLED(CONFIG_RCU_BOOST))

		pr_info("\tRCU kthread priority: %d.\n", kthread_prio);

		pr_info("\tRCU kthread priority: %d.\n", kthread_prio);

#endif

}

}





#ifdef CONFIG_PREEMPT_RCU

#ifdef CONFIG_PREEMPT_RCU