Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bca8cf1 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Remove unneeded __rcu_process_callbacks() argument 



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: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent d7e187c8

kernel/rcutree.c

+4 −4
Original line number Diff line number Diff line
@@ -1788,9 +1788,10 @@ unlock_fqs_ret: 
 * 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);
@@ -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");

}

kernel/rcutree_plugin.h

+1 −2
Original line number Diff line number Diff line
@@ -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