diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-02-08 20:14:39 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2011-05-06 02:16:54 -0400 |
commit | a00e0d714fbded07a7a2254391ce9ed5a5cb9d82 (patch) | |
tree | 7c213dbf1e2561655d07749b6d689027460fb8cc /kernel/rcutree_plugin.h | |
parent | 0ee5623f9a6e52df90a78bd21179f8ab370e102e (diff) |
rcu: Remove conditional compilation for RCU CPU stall warnings
The RCU CPU stall warnings can now be controlled using the
rcu_cpu_stall_suppress boot-time parameter or via the same parameter
from sysfs. There is therefore no longer any reason to have
kernel config parameters for this feature. This commit therefore
removes the RCU_CPU_STALL_DETECTOR and RCU_CPU_STALL_DETECTOR_RUNNABLE
kernel config parameters. The RCU_CPU_STALL_TIMEOUT parameter remains
to allow the timeout to be tuned and the RCU_CPU_STALL_VERBOSE parameter
remains to allow task-stall information to be suppressed if desired.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel/rcutree_plugin.h')
-rw-r--r-- | kernel/rcutree_plugin.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index a3638710dc67..38426ef1bcd6 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h | |||
@@ -54,10 +54,6 @@ static void __init rcu_bootup_announce_oddness(void) | |||
54 | #ifdef CONFIG_RCU_TORTURE_TEST_RUNNABLE | 54 | #ifdef CONFIG_RCU_TORTURE_TEST_RUNNABLE |
55 | printk(KERN_INFO "\tRCU torture testing starts during boot.\n"); | 55 | printk(KERN_INFO "\tRCU torture testing starts during boot.\n"); |
56 | #endif | 56 | #endif |
57 | #ifndef CONFIG_RCU_CPU_STALL_DETECTOR | ||
58 | printk(KERN_INFO | ||
59 | "\tRCU-based detection of stalled CPUs is disabled.\n"); | ||
60 | #endif | ||
61 | #if defined(CONFIG_TREE_PREEMPT_RCU) && !defined(CONFIG_RCU_CPU_STALL_VERBOSE) | 57 | #if defined(CONFIG_TREE_PREEMPT_RCU) && !defined(CONFIG_RCU_CPU_STALL_VERBOSE) |
62 | printk(KERN_INFO "\tVerbose stalled-CPUs detection is disabled.\n"); | 58 | printk(KERN_INFO "\tVerbose stalled-CPUs detection is disabled.\n"); |
63 | #endif | 59 | #endif |
@@ -356,8 +352,6 @@ void __rcu_read_unlock(void) | |||
356 | } | 352 | } |
357 | EXPORT_SYMBOL_GPL(__rcu_read_unlock); | 353 | EXPORT_SYMBOL_GPL(__rcu_read_unlock); |
358 | 354 | ||
359 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR | ||
360 | |||
361 | #ifdef CONFIG_RCU_CPU_STALL_VERBOSE | 355 | #ifdef CONFIG_RCU_CPU_STALL_VERBOSE |
362 | 356 | ||
363 | /* | 357 | /* |
@@ -430,8 +424,6 @@ static void rcu_preempt_stall_reset(void) | |||
430 | rcu_preempt_state.jiffies_stall = jiffies + ULONG_MAX / 2; | 424 | rcu_preempt_state.jiffies_stall = jiffies + ULONG_MAX / 2; |
431 | } | 425 | } |
432 | 426 | ||
433 | #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | ||
434 | |||
435 | /* | 427 | /* |
436 | * Check that the list of blocked tasks for the newly completed grace | 428 | * Check that the list of blocked tasks for the newly completed grace |
437 | * period is in fact empty. It is a serious bug to complete a grace | 429 | * period is in fact empty. It is a serious bug to complete a grace |
@@ -862,8 +854,6 @@ static void rcu_report_unblock_qs_rnp(struct rcu_node *rnp, unsigned long flags) | |||
862 | 854 | ||
863 | #endif /* #ifdef CONFIG_HOTPLUG_CPU */ | 855 | #endif /* #ifdef CONFIG_HOTPLUG_CPU */ |
864 | 856 | ||
865 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR | ||
866 | |||
867 | /* | 857 | /* |
868 | * Because preemptable RCU does not exist, we never have to check for | 858 | * Because preemptable RCU does not exist, we never have to check for |
869 | * tasks blocked within RCU read-side critical sections. | 859 | * tasks blocked within RCU read-side critical sections. |
@@ -888,8 +878,6 @@ static void rcu_preempt_stall_reset(void) | |||
888 | { | 878 | { |
889 | } | 879 | } |
890 | 880 | ||
891 | #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | ||
892 | |||
893 | /* | 881 | /* |
894 | * Because there is no preemptable RCU, there can be no readers blocked, | 882 | * Because there is no preemptable RCU, there can be no readers blocked, |
895 | * so there is no need to check for blocked tasks. So check only for | 883 | * so there is no need to check for blocked tasks. So check only for |