diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-03-19 15:27:50 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-06-10 16:39:44 -0400 |
commit | ce3d9c03d1fa079678cc8df1517011e215517cda (patch) | |
tree | 6363d0305edee5246afe6220fa428b7712887982 | |
parent | 63274cfb94aac109fc2490a70a96b26751608e57 (diff) |
rcu: Inline trivial wrapper function rcu_start_gp_per_cpu()
Given the changes that introduce note_gp_change(), rcu_start_gp_per_cpu()
is now a trivial wrapper function with only one caller. This commit
therefore inlines it into its sole call site.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r-- | kernel/rcutree.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index b73014998b40..391bd724cd77 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -1308,18 +1308,6 @@ static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp) | |||
1308 | } | 1308 | } |
1309 | 1309 | ||
1310 | /* | 1310 | /* |
1311 | * Do per-CPU grace-period initialization for running CPU. The caller | ||
1312 | * must hold the lock of the leaf rcu_node structure corresponding to | ||
1313 | * this CPU. | ||
1314 | */ | ||
1315 | static void | ||
1316 | rcu_start_gp_per_cpu(struct rcu_state *rsp, struct rcu_node *rnp, struct rcu_data *rdp) | ||
1317 | { | ||
1318 | /* Set state so that this CPU will detect the next quiescent state. */ | ||
1319 | __note_gp_changes(rsp, rnp, rdp); | ||
1320 | } | ||
1321 | |||
1322 | /* | ||
1323 | * Initialize a new grace period. | 1311 | * Initialize a new grace period. |
1324 | */ | 1312 | */ |
1325 | static int rcu_gp_init(struct rcu_state *rsp) | 1313 | static int rcu_gp_init(struct rcu_state *rsp) |
@@ -1367,7 +1355,7 @@ static int rcu_gp_init(struct rcu_state *rsp) | |||
1367 | WARN_ON_ONCE(rnp->completed != rsp->completed); | 1355 | WARN_ON_ONCE(rnp->completed != rsp->completed); |
1368 | ACCESS_ONCE(rnp->completed) = rsp->completed; | 1356 | ACCESS_ONCE(rnp->completed) = rsp->completed; |
1369 | if (rnp == rdp->mynode) | 1357 | if (rnp == rdp->mynode) |
1370 | rcu_start_gp_per_cpu(rsp, rnp, rdp); | 1358 | __note_gp_changes(rsp, rnp, rdp); |
1371 | rcu_preempt_boost_start_gp(rnp); | 1359 | rcu_preempt_boost_start_gp(rnp); |
1372 | trace_rcu_grace_period_init(rsp->name, rnp->gpnum, | 1360 | trace_rcu_grace_period_init(rsp->name, rnp->gpnum, |
1373 | rnp->level, rnp->grplo, | 1361 | rnp->level, rnp->grplo, |