leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rcu: Eliminate second argument of rcu_process_dyntick()

Browse Source 
At this point, the second argument to all calls to
rcu_process_dyntick() is a function of the same field of the
structure passed in as the first argument, namely, rsp->gpnum-1.
 So propagate rsp->gpnum-1 to all uses of the second argument
within rcu_process_dyntick() and then eliminate the second
argument.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: laijs@cn.fujitsu.com
Cc: dipankar@in.ibm.com
Cc: mathieu.desnoyers@polymtl.ca
Cc: josh@joshtriplett.org
Cc: dvhltc@us.ibm.com
Cc: niv@us.ibm.com
Cc: peterz@infradead.org
Cc: rostedt@goodmis.org
Cc: Valdis.Kletnieks@vt.edu
Cc: dhowells@redhat.com
LKML-Reference: <12626465503786-git-send-email->
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Paul E. McKenney 2010-01-04 15:09:05 -08:00 committed by Ingo Molnar
parent 39c0bbfc07
commit eb1ba45f1e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/rcutree.c
View File

@ -1147,7 +1147,7 @@ void rcu_check_callbacks(int cpu, int user)
* Returns 1 if the current grace period ends while scanning (possibly * Returns 1 if the current grace period ends while scanning (possibly
* because we made it end). * 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 *)) int (*f)(struct rcu_data *))
{ {
unsigned long bit; 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) { rcu_for_each_leaf_node(rsp, rnp) {
mask = 0; mask = 0;
spin_lock_irqsave(&rnp->lock, flags); spin_lock_irqsave(&rnp->lock, flags);
if (rnp->completed != lastcomp) { if (rnp->completed != rsp->gpnum - 1) {
spin_unlock_irqrestore(&rnp->lock, flags); spin_unlock_irqrestore(&rnp->lock, flags);
return 1; 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])) if ((rnp->qsmask & bit) != 0 && f(rsp->rda[cpu]))
mask |= bit; 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() releases rnp->lock. */
rcu_report_qs_rnp(mask, rsp, rnp, flags); 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. */ break; /* So gcc recognizes the dead code. */
/* Record dyntick-idle state. */ /* Record dyntick-idle state. */
gpdone = rcu_process_dyntick(rsp, rsp->gpnum - 1, gpdone = rcu_process_dyntick(rsp,
dyntick_save_progress_counter); dyntick_save_progress_counter);
spin_lock(&rnp->lock); /* irqs already disabled */ spin_lock(&rnp->lock); /* irqs already disabled */
if (gpdone) 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. */ /* Check dyntick-idle state, send IPI to laggarts. */
spin_unlock(&rnp->lock); /* irqs remain disabled */ spin_unlock(&rnp->lock); /* irqs remain disabled */
gpdone = rcu_process_dyntick(rsp, rsp->gpnum - 1, gpdone = rcu_process_dyntick(rsp, rcu_implicit_dynticks_qs);
rcu_implicit_dynticks_qs);
/* Leave state in case more forcing is required. */ /* Leave state in case more forcing is required. */