diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-03-28 23:48:36 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-06-10 16:44:56 -0400 |
commit | 9a5739d73f9369ba1cdba3889ee4e2f87be25a46 (patch) | |
tree | c1b03bf542ee77e4cff0b0d422a14e7772ba8baf | |
parent | efc151c33b971148894789dc7c5589dec46d4348 (diff) |
rcu: Remove "Experimental" flags
After a release or two, features are no longer experimental. Therefore,
this commit removes the "Experimental" tag from them.
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r-- | init/Kconfig | 2 | ||||
-rw-r--r-- | kernel/rcutree_plugin.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2d9b83104dcf..8df5116621ec 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -656,7 +656,7 @@ config RCU_BOOST_DELAY | |||
656 | Accept the default if unsure. | 656 | Accept the default if unsure. |
657 | 657 | ||
658 | config RCU_NOCB_CPU | 658 | config RCU_NOCB_CPU |
659 | bool "Offload RCU callback processing from boot-selected CPUs (EXPERIMENTAL" | 659 | bool "Offload RCU callback processing from boot-selected CPUs" |
660 | depends on TREE_RCU || TREE_PREEMPT_RCU | 660 | depends on TREE_RCU || TREE_PREEMPT_RCU |
661 | default n | 661 | default n |
662 | help | 662 | help |
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index 207844ea0226..6b3ccaae93ab 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -81,7 +81,7 @@ static void __init rcu_bootup_announce_oddness(void) | |||
81 | pr_info("\tFour-level hierarchy is enabled.\n"); | 81 | pr_info("\tFour-level hierarchy is enabled.\n"); |
82 | #endif | 82 | #endif |
83 | if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF) | 83 | if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF) |
84 | pr_info("\tExperimental boot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf); | 84 | pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf); |
85 | if (nr_cpu_ids != NR_CPUS) | 85 | if (nr_cpu_ids != NR_CPUS) |
86 | pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids); | 86 | pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids); |
87 | #ifdef CONFIG_RCU_NOCB_CPU | 87 | #ifdef CONFIG_RCU_NOCB_CPU |
@@ -91,19 +91,19 @@ static void __init rcu_bootup_announce_oddness(void) | |||
91 | have_rcu_nocb_mask = true; | 91 | have_rcu_nocb_mask = true; |
92 | } | 92 | } |
93 | #ifdef CONFIG_RCU_NOCB_CPU_ZERO | 93 | #ifdef CONFIG_RCU_NOCB_CPU_ZERO |
94 | pr_info("\tExperimental no-CBs CPU 0\n"); | 94 | pr_info("\tOffload RCU callbacks from CPU 0\n"); |
95 | cpumask_set_cpu(0, rcu_nocb_mask); | 95 | cpumask_set_cpu(0, rcu_nocb_mask); |
96 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU_ZERO */ | 96 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU_ZERO */ |
97 | #ifdef CONFIG_RCU_NOCB_CPU_ALL | 97 | #ifdef CONFIG_RCU_NOCB_CPU_ALL |
98 | pr_info("\tExperimental no-CBs for all CPUs\n"); | 98 | pr_info("\tOffload RCU callbacks from all CPUs\n"); |
99 | cpumask_setall(rcu_nocb_mask); | 99 | cpumask_setall(rcu_nocb_mask); |
100 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU_ALL */ | 100 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU_ALL */ |
101 | #endif /* #ifndef CONFIG_RCU_NOCB_CPU_NONE */ | 101 | #endif /* #ifndef CONFIG_RCU_NOCB_CPU_NONE */ |
102 | if (have_rcu_nocb_mask) { | 102 | if (have_rcu_nocb_mask) { |
103 | cpulist_scnprintf(nocb_buf, sizeof(nocb_buf), rcu_nocb_mask); | 103 | cpulist_scnprintf(nocb_buf, sizeof(nocb_buf), rcu_nocb_mask); |
104 | pr_info("\tExperimental no-CBs CPUs: %s.\n", nocb_buf); | 104 | pr_info("\tOffload RCU callbacks from CPUs: %s.\n", nocb_buf); |
105 | if (rcu_nocb_poll) | 105 | if (rcu_nocb_poll) |
106 | pr_info("\tExperimental polled no-CBs CPUs.\n"); | 106 | pr_info("\tPoll for callbacks from no-CBs CPUs.\n"); |
107 | } | 107 | } |
108 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU */ | 108 | #endif /* #ifdef CONFIG_RCU_NOCB_CPU */ |
109 | } | 109 | } |