summaryrefslogtreecommitdiffstats
path: root/kernel/rcu/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/rcu/tree.c')
-rw-r--r--kernel/rcu/tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index ba3f8d59d948..1edd11298224 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -119,8 +119,8 @@ module_param(dump_tree, bool, 0444);
119/* Control rcu_node-tree auto-balancing at boot time. */ 119/* Control rcu_node-tree auto-balancing at boot time. */
120static bool rcu_fanout_exact; 120static bool rcu_fanout_exact;
121module_param(rcu_fanout_exact, bool, 0444); 121module_param(rcu_fanout_exact, bool, 0444);
122/* Increase (but not decrease) the CONFIG_RCU_FANOUT_LEAF at boot time. */ 122/* Increase (but not decrease) the RCU_FANOUT_LEAF at boot time. */
123static int rcu_fanout_leaf = CONFIG_RCU_FANOUT_LEAF; 123static int rcu_fanout_leaf = RCU_FANOUT_LEAF;
124module_param(rcu_fanout_leaf, int, 0444); 124module_param(rcu_fanout_leaf, int, 0444);
125int rcu_num_lvls __read_mostly = RCU_NUM_LVLS; 125int rcu_num_lvls __read_mostly = RCU_NUM_LVLS;
126static int num_rcu_lvl[] = { /* Number of rcu_nodes at specified level. */ 126static int num_rcu_lvl[] = { /* Number of rcu_nodes at specified level. */
@@ -4097,7 +4097,7 @@ static void __init rcu_init_geometry(void)
4097 jiffies_till_next_fqs = d; 4097 jiffies_till_next_fqs = d;
4098 4098
4099 /* If the compile-time values are accurate, just leave. */ 4099 /* If the compile-time values are accurate, just leave. */
4100 if (rcu_fanout_leaf == CONFIG_RCU_FANOUT_LEAF && 4100 if (rcu_fanout_leaf == RCU_FANOUT_LEAF &&
4101 nr_cpu_ids == NR_CPUS) 4101 nr_cpu_ids == NR_CPUS)
4102 return; 4102 return;
4103 pr_info("RCU: Adjusting geometry for rcu_fanout_leaf=%d, nr_cpu_ids=%d\n", 4103 pr_info("RCU: Adjusting geometry for rcu_fanout_leaf=%d, nr_cpu_ids=%d\n",
@@ -4121,7 +4121,7 @@ static void __init rcu_init_geometry(void)
4121 * the configured number of CPUs. Complain and fall back to the 4121 * the configured number of CPUs. Complain and fall back to the
4122 * compile-time values if these limits are exceeded. 4122 * compile-time values if these limits are exceeded.
4123 */ 4123 */
4124 if (rcu_fanout_leaf < CONFIG_RCU_FANOUT_LEAF || 4124 if (rcu_fanout_leaf < RCU_FANOUT_LEAF ||
4125 rcu_fanout_leaf > sizeof(unsigned long) * 8 || 4125 rcu_fanout_leaf > sizeof(unsigned long) * 8 ||
4126 n > rcu_capacity[MAX_RCU_LVLS]) { 4126 n > rcu_capacity[MAX_RCU_LVLS]) {
4127 WARN_ON(1); 4127 WARN_ON(1);