aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-02-24 17:23:39 -0500
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-03-03 14:17:19 -0500
commite7580f33889299e484a80f42c20611ead42f199e (patch)
treedada5b9e84f353e0824104cbdcb9d2569758a19a
parent91afa21d5d0d79a02984d37509f1f827ae460f4e (diff)
rcu: Get rcu_sched_force_quiescent_state() where it belongs
The very similar functions rcu_force_quiescent_state(), rcu_bh_force_quiescent_state(), and rcu_sched_force_quiescent_state() are supposed to be together, but have drifted apart. This commit restores rcu_sched_force_quiescent_state() to its rightful place. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-rw-r--r--kernel/rcu/tree.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 35e1604f7e3e..fbe9dd9ced54 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -410,6 +410,15 @@ void rcu_bh_force_quiescent_state(void)
410EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state); 410EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
411 411
412/* 412/*
413 * Force a quiescent state for RCU-sched.
414 */
415void rcu_sched_force_quiescent_state(void)
416{
417 force_quiescent_state(&rcu_sched_state);
418}
419EXPORT_SYMBOL_GPL(rcu_sched_force_quiescent_state);
420
421/*
413 * Show the state of the grace-period kthreads. 422 * Show the state of the grace-period kthreads.
414 */ 423 */
415void show_rcu_gp_kthreads(void) 424void show_rcu_gp_kthreads(void)
@@ -483,15 +492,6 @@ void rcutorture_record_progress(unsigned long vernum)
483EXPORT_SYMBOL_GPL(rcutorture_record_progress); 492EXPORT_SYMBOL_GPL(rcutorture_record_progress);
484 493
485/* 494/*
486 * Force a quiescent state for RCU-sched.
487 */
488void rcu_sched_force_quiescent_state(void)
489{
490 force_quiescent_state(&rcu_sched_state);
491}
492EXPORT_SYMBOL_GPL(rcu_sched_force_quiescent_state);
493
494/*
495 * Does the CPU have callbacks ready to be invoked? 495 * Does the CPU have callbacks ready to be invoked?
496 */ 496 */
497static int 497static int