Eliminate synchronize_rcu_xxx macro
PATCH 1/1 Eliminate synchronize_rcu_xxx macro
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.
Ingo, could you please include into tip/core/rcu?
Signed-off-by Andi Kleen <[email protected]>
Signed-off-by Paul E. McKenney <[email protected]>
---
include/linux/rcupdate.h +0 -12
@@ -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
@@ -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
@@ -1176,7 +1176,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);/*
Signature · 3 lines
[email protected] ----- End forwarded message -----