From db0313206d9a8cdf608d2a5a897b908dd0e03096 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 11 Jul 2012 05:23:18 -0700 Subject: [PATCH] --- yaml --- r: 323523 b: refs/heads/master c: 25d30cf4250f74e5ceb35f8f39739782408db633 h: refs/heads/master i: 323521: a731cd490f8f794eaaddb2b1931a22e86f8a754c 323519: c226b2493a32d5dc98baf9c827cdcc1a8970f549 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ab1c179122b..4a23de225302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 661a85dc0d2ec0404e3b80909e413a9d5e42a239 +refs/heads/master: 25d30cf4250f74e5ceb35f8f39739782408db633 diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index f0f3a18c0a20..a2eadd04fb29 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -1080,6 +1080,7 @@ static int rcu_gp_init(struct rcu_state *rsp) rcu_preempt_check_blocked_tasks(rnp); rnp->qsmask = rnp->qsmaskinit; rnp->gpnum = rsp->gpnum; + WARN_ON_ONCE(rnp->completed != rsp->completed); rnp->completed = rsp->completed; if (rnp == rdp->mynode) rcu_start_gp_per_cpu(rsp, rnp, rdp); @@ -2777,7 +2778,8 @@ static void __init rcu_init_one(struct rcu_state *rsp, raw_spin_lock_init(&rnp->fqslock); lockdep_set_class_and_name(&rnp->fqslock, &rcu_fqs_class[i], fqs[i]); - rnp->gpnum = 0; + rnp->gpnum = rsp->gpnum; + rnp->completed = rsp->completed; rnp->qsmask = 0; rnp->qsmaskinit = 0; rnp->grplo = j * cpustride;