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

rcu: Remove "cpu" argument to rcu_pending()

Browse Source 
Because rcu_pending()'s argument is guaranteed to always be the current
CPU, drop the argument and replace per_cpu_ptr() with this_cpu_ptr().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Pranith Kumar <bobby.prani@gmail.com>
This commit is contained in:
Paul E. McKenney 2014-10-21 08:03:57 -07:00
parent c3377c2da6
commit e3950ecd55
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/rcu/tree.c
View File

@ -325,7 +325,7 @@ static void force_qs_rnp(struct rcu_state *rsp,
unsigned long *maxj), unsigned long *maxj),
bool *isidle, unsigned long *maxj); bool *isidle, unsigned long *maxj);
static void force_quiescent_state(struct rcu_state *rsp); static void force_quiescent_state(struct rcu_state *rsp);
static int rcu_pending(int cpu); static int rcu_pending(void);
/* /*
* Return the number of RCU-sched batches processed thus far for debug & stats. * Return the number of RCU-sched batches processed thus far for debug & stats.
@ -2421,7 +2421,7 @@ void rcu_check_callbacks(int user)
rcu_bh_qs(); rcu_bh_qs();
} }
rcu_preempt_check_callbacks(smp_processor_id()); rcu_preempt_check_callbacks(smp_processor_id());
if (rcu_pending(smp_processor_id())) if (rcu_pending())
invoke_rcu_core(); invoke_rcu_core();
if (user) if (user)
rcu_note_voluntary_context_switch(current); rcu_note_voluntary_context_switch(current);
@ -3144,12 +3144,12 @@ static int __rcu_pending(struct rcu_state *rsp, struct rcu_data *rdp)
* by the current CPU, returning 1 if so. This function is part of the * by the current CPU, returning 1 if so. This function is part of the
* RCU implementation; it is -not- an exported member of the RCU API. * RCU implementation; it is -not- an exported member of the RCU API.
*/ */
static int rcu_pending(int cpu) static int rcu_pending(void)
{ {
struct rcu_state *rsp; struct rcu_state *rsp;
for_each_rcu_flavor(rsp) for_each_rcu_flavor(rsp)
if (__rcu_pending(rsp, per_cpu_ptr(rsp->rda, cpu))) if (__rcu_pending(rsp, this_cpu_ptr(rsp->rda)))
return 1; return 1;
return 0; return 0;
} }