From 4f7d813ee74939fb10d4b2141b4d437e34e3c7ee Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Mon, 25 Jun 2012 08:41:11 -0700
Subject: [PATCH] --- yaml --- r: 323516 b: refs/heads/master c:
 b4be093fee0200789df59b6c90e2d099a20f55b3 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/rcutree.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45f57429fba2..e31adc646f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cdfc175c25c89eedc08460b5e6239c2ec67fcb6
+refs/heads/master: b4be093fee0200789df59b6c90e2d099a20f55b3
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index 6182686de4a6..723e2e723074 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -1767,6 +1767,7 @@ static void force_qs_rnp(struct rcu_state *rsp, int (*f)(struct rcu_data *))
 	struct rcu_node *rnp;
 
 	rcu_for_each_leaf_node(rsp, rnp) {
+		cond_resched();
 		mask = 0;
 		raw_spin_lock_irqsave(&rnp->lock, flags);
 		if (!rcu_gp_in_progress(rsp)) {