summaryrefslogtreecommitdiffstats
path: root/kernel/rcutree.c
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-03-19 12:21:29 -0700
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-06-10 13:39:44 -0700
commit63274cfb94aac109fc2490a70a96b26751608e57 (patch)
tree9e14753b46b04098ebd08607246a21cedd5dd235 /kernel/rcutree.c
parentba9fbe955f026780e6b27c279dba7c86dfdcb7d5 (diff)
downloadop-kernel-dev-63274cfb94aac109fc2490a70a96b26751608e57.zip
op-kernel-dev-63274cfb94aac109fc2490a70a96b26751608e57.tar.gz
rcu: Eliminate check_for_new_grace_period() wrapper function
One of the calls to check_for_new_grace_period() is now redundant due to an immediately preceding call to note_gp_changes(). Eliminating this redundant call leaves a single caller, which is simpler if inlined. This commit therefore eliminates the redundant call and inlines the body of check_for_new_grace_period() into the single remaining call site. 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.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index ac8f03c..b730149 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1308,26 +1308,6 @@ static void note_gp_changes(struct rcu_state *rsp, struct rcu_data *rdp)
}
/*
- * Did someone else start a new RCU grace period start since we last
- * checked? Update local state appropriately if so. Must be called
- * on the CPU corresponding to rdp.
- */
-static int
-check_for_new_grace_period(struct rcu_state *rsp, struct rcu_data *rdp)
-{
- unsigned long flags;
- int ret = 0;
-
- local_irq_save(flags);
- if (rdp->gpnum != rsp->gpnum) {
- note_gp_changes(rsp, rdp);
- ret = 1;
- }
- local_irq_restore(flags);
- return ret;
-}
-
-/*
* Do per-CPU grace-period initialization for running CPU. The caller
* must hold the lock of the leaf rcu_node structure corresponding to
* this CPU.
@@ -1749,8 +1729,10 @@ static void
rcu_check_quiescent_state(struct rcu_state *rsp, struct rcu_data *rdp)
{
/* If there is now a new grace period, record and return. */
- if (check_for_new_grace_period(rsp, rdp))
+ if (rdp->gpnum != rsp->gpnum) {
+ note_gp_changes(rsp, rdp);
return;
+ }
/*
* Does this CPU still need to do its part for current grace period?
@@ -2302,7 +2284,6 @@ static void __call_rcu_core(struct rcu_state *rsp, struct rcu_data *rdp,
/* Are we ignoring a completed grace period? */
note_gp_changes(rsp, rdp);
- check_for_new_grace_period(rsp, rdp);
/* Start a new grace period if one not already started. */
if (!rcu_gp_in_progress(rsp)) {
OpenPOWER on IntegriCloud