1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index a7773fc72b0c..72adf97458e3 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3731,6 +3731,11 @@ static void rcu_cleanup_dying_idle_cpu(int cpu, struct rcu_state *rsp)
         /* Remove outgoing CPU from mask in the leaf rcu_node structure. */
         mask = rdp->grpmask;
         raw_spin_lock_irqsave_rcu_node(rnp, flags); /* Enforce GP memory-order guarantee. */
+        if (rnp->qsmask & mask) { /* RCU waiting on outgoing CPU? */
+                /* Report quiescent state -before- changing ->qsmaskinitnext! */
+                rcu_report_qs_rnp(mask, rsp, rnp, rnp->gp_seq, flags);
+                raw_spin_lock_irqsave_rcu_node(rnp, flags);
+        }
         rnp->qsmaskinitnext &= ~mask;
         raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
 }