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

Commit 3b57a399 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Inline rcu_dynticks_momentary_idle() into its sole caller 



The rcu_dynticks_momentary_idle() function is invoked only from
rcu_momentary_dyntick_idle(), and neither function is particularly
large.  This commit therefore saves a few lines by inlining
rcu_dynticks_momentary_idle() into rcu_momentary_dyntick_idle().

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 15651201

kernel/rcu/tree.c

+7 −16
Original line number Diff line number Diff line
@@ -385,20 +385,6 @@ static bool rcu_dynticks_in_eqs_since(struct rcu_dynticks *rdtp, int snap) 
	return snap != rcu_dynticks_snap(rdtp);

}



/*

 * Do a double-increment of the ->dynticks counter to emulate a

 * momentary idle-CPU quiescent state.

 */

static void rcu_dynticks_momentary_idle(void)

{

	struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);

	int special = atomic_add_return(2 * RCU_DYNTICK_CTRL_CTR,

					&rdtp->dynticks);



	/* It is illegal to call this from idle state. */

	WARN_ON_ONCE(!(special & RCU_DYNTICK_CTRL_CTR));

}



/*

 * Set the special (bottom) bit of the specified CPU so that it

 * will take special action (such as flushing its TLB) on the
@@ -430,12 +416,17 @@ bool rcu_eqs_special_set(int cpu) 
 *

 * We inform the RCU core by emulating a zero-duration dyntick-idle period.

 *

 * The caller must have disabled interrupts.

 * The caller must have disabled interrupts and must not be idle.

 */

static void rcu_momentary_dyntick_idle(void)

{

	struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);

	int special;



	raw_cpu_write(rcu_dynticks.rcu_need_heavy_qs, false);

	rcu_dynticks_momentary_idle();

	special = atomic_add_return(2 * RCU_DYNTICK_CTRL_CTR, &rdtp->dynticks);

	/* It is illegal to call this from idle state. */

	WARN_ON_ONCE(!(special & RCU_DYNTICK_CTRL_CTR));

}



/*