---

yaml --- r: 268975 b: refs/heads/master c: 5c51dd7 h: refs/heads/master i: 268973: 4c23b25 268971: a711806 268967: 959b37d 268959: eff6dab v: v3
git-mirror · Sep 29, 2011 · 3018005 · 3018005
1 parent 0230b0a
commit 3018005
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: 4627e240dfee4a0a46a58010b1b721b4ded1918f
+refs/heads/master: 5c51dd7349d4bb26f845f17f85daa168f5fa03f2
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -1707,7 +1707,8 @@ static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp)
 	check_cpu_stall(rsp, rdp);
 
 	/* Is the RCU core waiting for a quiescent state from this CPU? */
-	if (rdp->qs_pending && !rdp->passed_quiesce) {
+	if (rcu_scheduler_fully_active &&
+	    rdp->qs_pending && !rdp->passed_quiesce) {
 
 		/*
 		 * If force_quiescent_state() coming soon and this CPU