1 files changed, 5 insertions, 6 deletions

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 62b64332effb..c7d00700fc4e 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1147,7 +1147,7 @@ void rcu_check_callbacks(int cpu, int user)
  * Returns 1 if the current grace period ends while scanning (possibly
  * because we made it end).
  */
-static int rcu_process_dyntick(struct rcu_state *rsp, long lastcomp,
+static int rcu_process_dyntick(struct rcu_state *rsp,
                                int (*f)(struct rcu_data *))
 {
         unsigned long bit;
@@ -1159,7 +1159,7 @@ static int rcu_process_dyntick(struct rcu_state *rsp, long lastcomp,
         rcu_for_each_leaf_node(rsp, rnp) {
                 mask = 0;
                 spin_lock_irqsave(&rnp->lock, flags);
-                if (rnp->completed != lastcomp) {
+                if (rnp->completed != rsp->gpnum - 1) {
                         spin_unlock_irqrestore(&rnp->lock, flags);
                         return 1;
                 }
@@ -1173,7 +1173,7 @@ static int rcu_process_dyntick(struct rcu_state *rsp, long lastcomp,
                         if ((rnp->qsmask & bit) != 0 && f(rsp->rda[cpu]))
                                 mask |= bit;
                 }
-                if (mask != 0 && rnp->completed == lastcomp) {
+                if (mask != 0 && rnp->completed == rsp->gpnum - 1) {
 
                         /* rcu_report_qs_rnp() releases rnp->lock. */
                         rcu_report_qs_rnp(mask, rsp, rnp, flags);
@@ -1226,7 +1226,7 @@ static void force_quiescent_state(struct rcu_state *rsp, int relaxed)
                         break; /* So gcc recognizes the dead code. */
 
                 /* Record dyntick-idle state. */
-                gpdone = rcu_process_dyntick(rsp, rsp->gpnum - 1,
+                gpdone = rcu_process_dyntick(rsp,
                                              dyntick_save_progress_counter);
                 spin_lock(&rnp->lock);  /* irqs already disabled */
                 if (gpdone)
@@ -1249,8 +1249,7 @@ static void force_quiescent_state(struct rcu_state *rsp, int relaxed)
 
                 /* Check dyntick-idle state, send IPI to laggarts. */
                 spin_unlock(&rnp->lock);  /* irqs remain disabled */
-                gpdone = rcu_process_dyntick(rsp, rsp->gpnum - 1,
-                                             rcu_implicit_dynticks_qs);
+                gpdone = rcu_process_dyntick(rsp, rcu_implicit_dynticks_qs);
 
                 /* Leave state in case more forcing is required. */