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.c | |
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.c')
-rw-r--r-- | kernel/rcutree.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index dd4aea806f8e..18f7a593d4c7 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -140,10 +140,8 @@ module_param(blimit, int, 0); | |||
140 | module_param(qhimark, int, 0); | 140 | module_param(qhimark, int, 0); |
141 | module_param(qlowmark, int, 0); | 141 | module_param(qlowmark, int, 0); |
142 | 142 | ||
143 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR | 143 | int rcu_cpu_stall_suppress __read_mostly; |
144 | int rcu_cpu_stall_suppress __read_mostly = RCU_CPU_STALL_SUPPRESS_INIT; | ||
145 | module_param(rcu_cpu_stall_suppress, int, 0644); | 144 | module_param(rcu_cpu_stall_suppress, int, 0644); |
146 | #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | ||
147 | 145 | ||
148 | static void force_quiescent_state(struct rcu_state *rsp, int relaxed); | 146 | static void force_quiescent_state(struct rcu_state *rsp, int relaxed); |
149 | static int rcu_pending(int cpu); | 147 | static int rcu_pending(int cpu); |
@@ -450,8 +448,6 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) | |||
450 | 448 | ||
451 | #endif /* #else #ifdef CONFIG_NO_HZ */ | 449 | #endif /* #else #ifdef CONFIG_NO_HZ */ |
452 | 450 | ||
453 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR | ||
454 | |||
455 | int rcu_cpu_stall_suppress __read_mostly; | 451 | int rcu_cpu_stall_suppress __read_mostly; |
456 | 452 | ||
457 | static void record_gp_stall_check_time(struct rcu_state *rsp) | 453 | static void record_gp_stall_check_time(struct rcu_state *rsp) |
@@ -587,26 +583,6 @@ static void __init check_cpu_stall_init(void) | |||
587 | atomic_notifier_chain_register(&panic_notifier_list, &rcu_panic_block); | 583 | atomic_notifier_chain_register(&panic_notifier_list, &rcu_panic_block); |
588 | } | 584 | } |
589 | 585 | ||
590 | #else /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | ||
591 | |||
592 | static void record_gp_stall_check_time(struct rcu_state *rsp) | ||
593 | { | ||
594 | } | ||
595 | |||
596 | static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp) | ||
597 | { | ||
598 | } | ||
599 | |||
600 | void rcu_cpu_stall_reset(void) | ||
601 | { | ||
602 | } | ||
603 | |||
604 | static void __init check_cpu_stall_init(void) | ||
605 | { | ||
606 | } | ||
607 | |||
608 | #endif /* #else #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ | ||
609 | |||
610 | /* | 586 | /* |
611 | * Update CPU-local rcu_data state to record the newly noticed grace period. | 587 | * Update CPU-local rcu_data state to record the newly noticed grace period. |
612 | * This is used both when we started the grace period and when we notice | 588 | * This is used both when we started the grace period and when we notice |