---

yaml --- r: 268977 b: refs/heads/master c: 037067a h: refs/heads/master i: 268975: 3018005 v: v3
git-mirror · Sep 29, 2011 · 34b04a0 · 34b04a0
1 parent dd729e7
commit 34b04a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82e78d80fc392ac7e98326bc8beeb8a679913ffd
+refs/heads/master: 037067a1b6f9a70f862f3ed9d59fe28b7cd55ac4
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -838,8 +838,11 @@ rcu_start_gp(struct rcu_state *rsp, unsigned long flags)
 	struct rcu_data *rdp = this_cpu_ptr(rsp->rda);
 	struct rcu_node *rnp = rcu_get_root(rsp);
 
-	if (!cpu_needs_another_gp(rsp, rdp) || rsp->fqs_active) {
-		if (cpu_needs_another_gp(rsp, rdp))
+	if (!rcu_scheduler_fully_active ||
+	    !cpu_needs_another_gp(rsp, rdp) ||
+	    rsp->fqs_active) {
+		if (rcu_scheduler_fully_active &&
+		    cpu_needs_another_gp(rsp, rdp))
 			rsp->fqs_need_gp = 1;
 		if (rnp->completed == rsp->completed) {
 			raw_spin_unlock_irqrestore(&rnp->lock, flags);