Skip to content

Commit

Permalink
rcu: Remove unneeded __rcu_process_callbacks() argument
Browse files Browse the repository at this point in the history
With the advent of __this_cpu_ptr(), it is no longer necessary to pass
both the rcu_state and rcu_data structures into __rcu_process_callbacks().
This commit therefore computes the rcu_data pointer from the rcu_state
pointer within __rcu_process_callbacks() so that callers can pass in
only the pointer to the rcu_state structure.  This paves the way for
linking the rcu_state structures together and iterating over them.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
  • Loading branch information
paulmck committed Jul 2, 2012
1 parent d7e187c commit 1bca8cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions kernel/rcutree.c
Original file line number Diff line number Diff line change
Expand Up @@ -1788,9 +1788,10 @@ static void force_quiescent_state(struct rcu_state *rsp, int relaxed)
* whom the rdp belongs.
*/
static void
__rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
__rcu_process_callbacks(struct rcu_state *rsp)
{
unsigned long flags;
struct rcu_data *rdp = __this_cpu_ptr(rsp->rda);

WARN_ON_ONCE(rdp->beenonline == 0);

Expand Down Expand Up @@ -1827,9 +1828,8 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
static void rcu_process_callbacks(struct softirq_action *unused)
{
trace_rcu_utilization("Start RCU core");
__rcu_process_callbacks(&rcu_sched_state,
&__get_cpu_var(rcu_sched_data));
__rcu_process_callbacks(&rcu_bh_state, &__get_cpu_var(rcu_bh_data));
__rcu_process_callbacks(&rcu_sched_state);
__rcu_process_callbacks(&rcu_bh_state);
rcu_preempt_process_callbacks();
trace_rcu_utilization("End RCU core");
}
Expand Down
3 changes: 1 addition & 2 deletions kernel/rcutree_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,7 @@ static void rcu_preempt_check_callbacks(int cpu)
*/
static void rcu_preempt_process_callbacks(void)
{
__rcu_process_callbacks(&rcu_preempt_state,
&__get_cpu_var(rcu_preempt_data));
__rcu_process_callbacks(&rcu_preempt_state);
}

#ifdef CONFIG_RCU_BOOST
Expand Down

0 comments on commit 1bca8cf

Please sign in to comment.