From a1489d1961d7deb7f7be30b0001ca1adf9eab316 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Mon, 13 Aug 2012 11:17:06 -0700 Subject: [PATCH] --- yaml --- r: 323544 b: refs/heads/master c: c96ea7cfdd88d0a67c970502bc5313fede34b86b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 21a0436ee5a3..ef4df6ad0261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8020a67e625c714c4dbedc8ae2944b461e204ec +refs/heads/master: c96ea7cfdd88d0a67c970502bc5313fede34b86b diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c index 2cf8eb3e2d43..98f275296c6d 100644 --- a/trunk/kernel/rcutree.c +++ b/trunk/kernel/rcutree.c @@ -819,7 +819,8 @@ static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp) j = ACCESS_ONCE(jiffies); js = ACCESS_ONCE(rsp->jiffies_stall); rnp = rdp->mynode; - if ((ACCESS_ONCE(rnp->qsmask) & rdp->grpmask) && ULONG_CMP_GE(j, js)) { + if (rcu_gp_in_progress(rsp) && + (ACCESS_ONCE(rnp->qsmask) & rdp->grpmask) && ULONG_CMP_GE(j, js)) { /* We haven't checked in, so go dump stack. */ print_cpu_stall(rsp);