---

yaml --- r: 323544 b: refs/heads/master c: c96ea7c h: refs/heads/master v: v3
git-mirror · Sep 23, 2012 · a1489d1 · a1489d1
1 parent d2c331c
commit a1489d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);