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

Commit ea7d3fef authored Jan 04, 2009 by Paul E. McKenney Committed by Ingo Molnar Jan 05, 2009

rcu: eliminate synchronize_rcu_xxx macro



Impact: cleanup

Expand macro into two files.

The synchronize_rcu_xxx macro is quite ugly and it's only used by two
callers, so expand it instead.  This makes this code easier to change.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 90a4d2c0

include/linux/rcupdate.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -204,18 +204,6 @@ struct rcu_synchronize {

		extern void wakeme_after_rcu(struct rcu_head *head);

		#define synchronize_rcu_xxx(name, func) \
		void name(void) \
		{ \
		struct rcu_synchronize rcu; \
		\
		init_completion(&rcu.completion); \
		/* Will wake me after RCU finished. */ \
		func(&rcu.head, wakeme_after_rcu); \
		/* Wait for it. */ \
		wait_for_completion(&rcu.completion); \
		}

		/**
		* synchronize_sched - block until all CPUs have exited any non-preemptive
		* kernel code sequences.

kernel/rcupdate.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,15 @@ void wakeme_after_rcu(struct rcu_head *head)
		* sections are delimited by rcu_read_lock() and rcu_read_unlock(),
		* and may be nested.
		*/
		void synchronize_rcu(void); /* Makes kernel-doc tools happy */
		synchronize_rcu_xxx(synchronize_rcu, call_rcu)
		void synchronize_rcu(void)
		{
		struct rcu_synchronize rcu;
		init_completion(&rcu.completion);
		/* Will wake me after RCU finished. */
		call_rcu(&rcu.head, wakeme_after_rcu);
		/* Wait for it. */
		wait_for_completion(&rcu.completion);
		}
		EXPORT_SYMBOL_GPL(synchronize_rcu);

		static void rcu_barrier_callback(struct rcu_head *notused)

kernel/rcupreempt.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -1177,7 +1177,16 @@ EXPORT_SYMBOL_GPL(call_rcu_sched);
		* in -rt this does -not- necessarily result in all currently executing
		* interrupt -handlers- having completed.
		*/
		synchronize_rcu_xxx(__synchronize_sched, call_rcu_sched)
		void __synchronize_sched(void)
		{
		struct rcu_synchronize rcu;

		init_completion(&rcu.completion);
		/* Will wake me after RCU finished. */
		call_rcu_sched(&rcu.head, wakeme_after_rcu);
		/* Wait for it. */
		wait_for_completion(&rcu.completion);
		}
		EXPORT_SYMBOL_GPL(__synchronize_sched);

		/*