From 30180054c61b5164dd5b523c8c0c2a3acebb4ece Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Thu, 4 Aug 2011 06:59:03 -0700 Subject: [PATCH] --- yaml --- r: 268975 b: refs/heads/master c: 5c51dd7349d4bb26f845f17f85daa168f5fa03f2 h: refs/heads/master i: 268973: 4c23b25f8320a158f22ab48d3e29626aba93ef88 268971: a711806a3a4c971cdd9f3d1ab382a6dacf4a3aa7 268967: 959b37d79379b80a05d06223ca35564e4922b401 268959: eff6dabd32c4a2608e9c70bdeb89386ac7a90780 v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 102a61be2572..9de408b51fc6 100644 --- 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 index a07bf553e02a..0051dbf6958e 100644 --- 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