rcu: Merge rcu_sched_force_quiescent_state() with rcu_force_quiescent_state() (a381d757) · Commits · 戴 / test

This patch merges the function rcu_force_quiescent_state() with rcu_sched_force_quiescent_state(), using the rcu_state pointer. Firstly, the rcu_sched_force_quiescent_state() function is deleted from the file kernel/rcu/tree.c. Also, the rcu_force_quiescent_state() function that was calling force_quiescent_state with the argument rcu_preempt_state pointer was deleted as well. The new function that combines the old ones uses the rcu_state pointer and is located after rcu_batches_completed_bh() in kernel/rcu/tree.c. Signed-off-by:

Andreea-Cristina Bernat <bernat.ada@gmail.com> Signed-off-by:

Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by:

Josh Triplett <josh@joshtriplett.org>

kernel/rcu/tree.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,15 @@ long rcu_batches_completed_bh(void)
		}
		EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);

		/*
		* Force a quiescent state.
		*/
		void rcu_force_quiescent_state(void)
		{
		force_quiescent_state(rcu_state);
		}
		EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);

		/*
		* Force a quiescent state for RCU BH.
		*/

kernel/rcu/tree_plugin.h

+0 −19

Original line number	Diff line number	Diff line
		@@ -148,15 +148,6 @@ long rcu_batches_completed(void)
		}
		EXPORT_SYMBOL_GPL(rcu_batches_completed);

		/*
		* Force a quiescent state for preemptible RCU.
		*/
		void rcu_force_quiescent_state(void)
		{
		force_quiescent_state(&rcu_preempt_state);
		}
		EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);

		/*
		* Record a preemptible-RCU quiescent state for the specified CPU. Note
		* that this just means that the task currently running on the CPU is
		@@ -976,16 +967,6 @@ long rcu_batches_completed(void)
		}
		EXPORT_SYMBOL_GPL(rcu_batches_completed);

		/*
		* Force a quiescent state for RCU, which, because there is no preemptible
		* RCU, becomes the same as rcu-sched.
		*/
		void rcu_force_quiescent_state(void)
		{
		rcu_sched_force_quiescent_state();
		}
		EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);

		/*
		* Because preemptible RCU does not exist, we never have to check for
		* CPUs being in quiescent states.

Admin message