summaryrefslogtreecommitdiffstats
path: root/kernel/rcu
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2015-01-13 15:30:34 +0800
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-02-25 17:03:05 -0800
commit3f47da0f32f5e43e6ae901129d5b9c2600011a2c (patch)
tree63b3993c69978f0004ab37b957ae4e69aea6cd90 /kernel/rcu
parentee376dbdf27728a2f3d30e2ba10fa387cc4c645b (diff)
downloadop-kernel-dev-3f47da0f32f5e43e6ae901129d5b9c2600011a2c.zip
op-kernel-dev-3f47da0f32f5e43e6ae901129d5b9c2600011a2c.tar.gz
rcu_tree: Avoid touching rnp->completed when a new GP is started
In rcu_gp_init(), rnp->completed equals to rsp->completed in THEORY, we don't need to touch it normally. If something goes wrong, it will complain and fixup rnp->completed and avoid oops. This commit thus avoids the normal needless store to rnp->completed. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/rcu')
-rw-r--r--kernel/rcu/tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 48d640c..077d0b7 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1757,8 +1757,8 @@ static int rcu_gp_init(struct rcu_state *rsp)
rcu_preempt_check_blocked_tasks(rnp);
rnp->qsmask = rnp->qsmaskinit;
ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
- WARN_ON_ONCE(rnp->completed != rsp->completed);
- ACCESS_ONCE(rnp->completed) = rsp->completed;
+ if (WARN_ON_ONCE(rnp->completed != rsp->completed))
+ ACCESS_ONCE(rnp->completed) = rsp->completed;
if (rnp == rdp->mynode)
(void)__note_gp_changes(rsp, rnp, rdp);
rcu_preempt_boost_start_gp(rnp);
OpenPOWER on IntegriCloud