[tip: core/rcu] rcu: Replace synchronize_sched_expedited_wait() "_sched" with "_rcu"
From: tip-bot2 for Paul E. McKenney
Date: Sat Jan 25 2020 - 05:44:03 EST
The following commit has been merged into the core/rcu branch of tip:
Commit-ID: 28f0361fdfab267a392cd6a6401446c9ea64de95
Gitweb: https://git.kernel.org/tip/28f0361fdfab267a392cd6a6401446c9ea64de95
Author: Paul E. McKenney <paulmck@xxxxxxxxxx>
AuthorDate: Wed, 27 Nov 2019 14:24:58 -08:00
Committer: Paul E. McKenney <paulmck@xxxxxxxxxx>
CommitterDate: Mon, 09 Dec 2019 12:24:59 -08:00
rcu: Replace synchronize_sched_expedited_wait() "_sched" with "_rcu"
After RCU flavor consolidation, synchronize_sched_expedited_wait() does
both RCU-preempt and RCU-sched, whichever happens to have been built into
the running kernel. This commit therefore changes this function's name
to synchronize_rcu_expedited_wait() to reflect its new generic nature.
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
---
kernel/rcu/tree_exp.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h
index 1eafbcd..081a179 100644
--- a/kernel/rcu/tree_exp.h
+++ b/kernel/rcu/tree_exp.h
@@ -453,7 +453,7 @@ static void sync_rcu_exp_select_cpus(void)
* Wait for the expedited grace period to elapse, issuing any needed
* RCU CPU stall warnings along the way.
*/
-static void synchronize_sched_expedited_wait(void)
+static void synchronize_rcu_expedited_wait(void)
{
int cpu;
unsigned long jiffies_stall;
@@ -538,7 +538,7 @@ static void rcu_exp_wait_wake(unsigned long s)
{
struct rcu_node *rnp;
- synchronize_sched_expedited_wait();
+ synchronize_rcu_expedited_wait();
// Switch over to wakeup mode, allowing the next GP to proceed.
// End the previous grace period only after acquiring the mutex