diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-04-21 12:12:13 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-05-27 15:59:05 -0400 |
commit | 47d631af58bb9b2f2dd3d0da8c98a79a5e75c738 (patch) | |
tree | 7472330c70684ac02140d2f3796b042b53a4f6dd /kernel/rcu/tree_plugin.h | |
parent | 05c5df31afd1092ca6322094d22aff6351fa67fe (diff) |
rcu: Make RCU able to tolerate undefined CONFIG_RCU_FANOUT_LEAF
This commit introduces an RCU_FANOUT_LEAF C-preprocessor macro so
that RCU will build even when CONFIG_RCU_FANOUT_LEAF is undefined.
The RCU_FANOUT_LEAF macro is set to the value of CONFIG_RCU_FANOUT_LEAF
when defined, otherwise it is set to 32 for 32-bit systems and 64 for
64-bit systems. This commit then makes CONFIG_RCU_FANOUT_LEAF depend
on CONFIG_RCU_EXPERT, so that Kconfig users won't be asked about
CONFIG_RCU_FANOUT_LEAF unless they want to be.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Pranith Kumar <bobby.prani@gmail.com>
Diffstat (limited to 'kernel/rcu/tree_plugin.h')
-rw-r--r-- | kernel/rcu/tree_plugin.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index d7e505970f24..713503853841 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -76,10 +76,10 @@ static void __init rcu_bootup_announce_oddness(void) | |||
76 | pr_info("\tAdditional per-CPU info printed with stalls.\n"); | 76 | pr_info("\tAdditional per-CPU info printed with stalls.\n"); |
77 | if (NUM_RCU_LVL_4 != 0) | 77 | if (NUM_RCU_LVL_4 != 0) |
78 | pr_info("\tFour-level hierarchy is enabled.\n"); | 78 | pr_info("\tFour-level hierarchy is enabled.\n"); |
79 | if (CONFIG_RCU_FANOUT_LEAF != 16) | 79 | if (RCU_FANOUT_LEAF != 16) |
80 | pr_info("\tBuild-time adjustment of leaf fanout to %d.\n", | 80 | pr_info("\tBuild-time adjustment of leaf fanout to %d.\n", |
81 | CONFIG_RCU_FANOUT_LEAF); | 81 | RCU_FANOUT_LEAF); |
82 | if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF) | 82 | if (rcu_fanout_leaf != RCU_FANOUT_LEAF) |
83 | pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf); | 83 | pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf); |
84 | if (nr_cpu_ids != NR_CPUS) | 84 | if (nr_cpu_ids != NR_CPUS) |
85 | pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids); | 85 | pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids); |