aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcutree.h
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-02-08 20:14:39 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-05-06 02:16:54 -0400
commita00e0d714fbded07a7a2254391ce9ed5a5cb9d82 (patch)
tree7c213dbf1e2561655d07749b6d689027460fb8cc /kernel/rcutree.h
parent0ee5623f9a6e52df90a78bd21179f8ab370e102e (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.h')
-rw-r--r--kernel/rcutree.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
index e8f057e44e3e..e1a6663c0155 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@ -254,7 +254,6 @@ struct rcu_data {
254#endif /* #else #ifdef CONFIG_NO_HZ */ 254#endif /* #else #ifdef CONFIG_NO_HZ */
255 255
256#define RCU_JIFFIES_TILL_FORCE_QS 3 /* for rsp->jiffies_force_qs */ 256#define RCU_JIFFIES_TILL_FORCE_QS 3 /* for rsp->jiffies_force_qs */
257#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
258 257
259#ifdef CONFIG_PROVE_RCU 258#ifdef CONFIG_PROVE_RCU
260#define RCU_STALL_DELAY_DELTA (5 * HZ) 259#define RCU_STALL_DELAY_DELTA (5 * HZ)
@@ -272,13 +271,6 @@ struct rcu_data {
272 /* scheduling clock irq */ 271 /* scheduling clock irq */
273 /* before ratting on them. */ 272 /* before ratting on them. */
274 273
275#ifdef CONFIG_RCU_CPU_STALL_DETECTOR_RUNNABLE
276#define RCU_CPU_STALL_SUPPRESS_INIT 0
277#else
278#define RCU_CPU_STALL_SUPPRESS_INIT 1
279#endif
280
281#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
282 274
283/* 275/*
284 * RCU global state, including node hierarchy. This hierarchy is 276 * RCU global state, including node hierarchy. This hierarchy is
@@ -325,12 +317,10 @@ struct rcu_state {
325 /* due to lock unavailable. */ 317 /* due to lock unavailable. */
326 unsigned long n_force_qs_ngp; /* Number of calls leaving */ 318 unsigned long n_force_qs_ngp; /* Number of calls leaving */
327 /* due to no GP active. */ 319 /* due to no GP active. */
328#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
329 unsigned long gp_start; /* Time at which GP started, */ 320 unsigned long gp_start; /* Time at which GP started, */
330 /* but in jiffies. */ 321 /* but in jiffies. */
331 unsigned long jiffies_stall; /* Time at which to check */ 322 unsigned long jiffies_stall; /* Time at which to check */
332 /* for CPU stalls. */ 323 /* for CPU stalls. */
333#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
334 char *name; /* Name of structure. */ 324 char *name; /* Name of structure. */
335}; 325};
336 326
@@ -366,11 +356,9 @@ static int rcu_preempted_readers(struct rcu_node *rnp);
366static void rcu_report_unblock_qs_rnp(struct rcu_node *rnp, 356static void rcu_report_unblock_qs_rnp(struct rcu_node *rnp,
367 unsigned long flags); 357 unsigned long flags);
368#endif /* #ifdef CONFIG_HOTPLUG_CPU */ 358#endif /* #ifdef CONFIG_HOTPLUG_CPU */
369#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
370static void rcu_print_detail_task_stall(struct rcu_state *rsp); 359static void rcu_print_detail_task_stall(struct rcu_state *rsp);
371static void rcu_print_task_stall(struct rcu_node *rnp); 360static void rcu_print_task_stall(struct rcu_node *rnp);
372static void rcu_preempt_stall_reset(void); 361static void rcu_preempt_stall_reset(void);
373#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
374static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp); 362static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);
375#ifdef CONFIG_HOTPLUG_CPU 363#ifdef CONFIG_HOTPLUG_CPU
376static int rcu_preempt_offline_tasks(struct rcu_state *rsp, 364static int rcu_preempt_offline_tasks(struct rcu_state *rsp,