---

yaml --- r: 190994 b: refs/heads/master c: d25eb94 h: refs/heads/master v: v3
git-mirror · May 10, 2010 · 46a50ef · 46a50ef
1 parent 28d9a0d
commit 46a50ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b3fc35f6919344e3cf722dde8308f47235c0b70
+refs/heads/master: d25eb9442bb2c38c1e742f0fa764d7132d72593f
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
@@ -1499,6 +1499,16 @@ static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp)
 
 	/* Is the RCU core waiting for a quiescent state from this CPU? */
 	if (rdp->qs_pending) {
+
+		/*
+		 * If force_quiescent_state() coming soon and this CPU
+		 * needs a quiescent state, and this is either RCU-sched
+		 * or RCU-bh, force a local reschedule.
+		 */
+		if (!rdp->preemptable &&
+		    ULONG_CMP_LT(ACCESS_ONCE(rsp->jiffies_force_qs) - 1,
+				 jiffies))
+			set_need_resched();
 		rdp->n_rp_qs_pending++;
 		return 1;
 	}