rcu: re-arrange code to reduce #ifdef pain
PATCH 1/1 rcu: re-arrange code to reduce #ifdef pain
Remove #ifdefs from kernel/rcupdate.c and include/linux/rcupdate.h by moving code to include/linux/rcutiny.h, include/linux/rcutree.h, and kernel/rcutree.c. Also remove some definitions that are no longer used.
Signed-off-by Paul E. McKenney <[email protected]>
--- include/linux/rcupdate.h | 12 ----- include/linux/rcutiny.h | 11 +++++ include/linux/rcutree.h | 4 +- kernel/rcupdate.c | 104 ---------------------------------------------- kernel/rcutree.c | 80 +++++++++++++++++++++++++++++++++++ kernel/rcutree_plugin.h | 24 +++++++++++ 6 files changed, 118 insertions(+), 117 deletions(-)
include/linux/rcupdate.h +0 -12
@@ -52,11 +52,6 @@ struct rcu_head { };/* Exported common interfaces */ -#ifdef CONFIG_TREE_PREEMPT_RCU -extern void synchronize_rcu (void ); -#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */ -#define synchronize_rcu synchronize_sched -#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */ extern void synchronize_rcu_bh (void );extern void synchronize_sched (void );extern void rcu_barrier (void );
@@ -67,13 +62,6 @@ extern int sched_expedited_torture_stats(char *page);/* Internal to kernel */ extern void rcu_init (void ); -extern void rcu_scheduler_starting (void ); -#ifndef CONFIG_TINY_RCU -extern int rcu_needs_cpu (int cpu); -#else -static inline int rcu_needs_cpu (int cpu) {return 0 ; } -#endif -extern int rcu_scheduler_active;#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_TREE_PREEMPT_RCU )#include <linux/rcutree.h>
include/linux/rcutiny.h +11 -0
@@ -39,6 +39,11 @@ void rcu_bh_qs(int cpu);#define rcu_init_sched () do { } while (0)extern void rcu_check_callbacks (int cpu,int user); +static inline int rcu_needs_cpu (int cpu) +{ +return 0 ; +} +/* * Return the number of grace periods. */
@@ -57,6 +62,8 @@ static inline long rcu_batches_completed_bh(void)extern int rcu_expedited_torture_stats (char *page); +#define synchronize_rcu synchronize_sched +static inline void synchronize_rcu_expedited (void ) {synchronize_sched ();
@@ -86,6 +93,10 @@ static inline void rcu_exit_nohz(void)#endif /* #else #ifdef CONFIG_NO_HZ */ +static inline void rcu_scheduler_starting (void ) +{ +} +static inline void exit_rcu (void ) { }
include/linux/rcutree.h +3 -1
@@ -35,12 +35,14 @@ struct notifier_block;extern void rcu_sched_qs (int cpu);extern void rcu_bh_qs (int cpu);extern int rcu_needs_cpu (int cpu); +extern void rcu_scheduler_starting (void );extern int rcu_expedited_torture_stats (char *page);#ifdef CONFIG_TREE_PREEMPT_RCU extern void __rcu_read_lock (void );extern void __rcu_read_unlock (void ); +extern void synchronize_rcu (void );extern void exit_rcu (void );#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
@@ -55,7 +57,7 @@ static inline void __rcu_read_unlock(void)preempt_enable (); } -#define __synchronize_sched () synchronize_rcu() +#define synchronize_rcu synchronize_schedstatic inline void exit_rcu (void ) {
kernel/rcupdate.c +0 -104
119 lines not on this page · raw message
kernel/rcutree.c +80 -0
104 lines not on this page · raw message
kernel/rcutree_plugin.h +24 -0
@@ -425,6 +425,30 @@ void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) }EXPORT_SYMBOL_GPL (call_rcu); +/** +* synchronize_rcu - wait until a grace period has elapsed. +* +* Control will return to the caller some time after a full grace +* period has elapsed, in other words after all currently executing RCU +* read-side critical sections have completed. RCU read-side critical +* sections are delimited by rcu_read_lock() and rcu_read_unlock(), +* and may be nested. +*/ +void synchronize_rcu (void ) +{ +struct rcu_synchronize rcu; + +if (!rcu_scheduler_active) +return ; + +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); +/* * Wait for an rcu-preempt grace period. We are supposed to expedite the * grace period, but this is the crude slow compatability hack, so just
Signature · 1 line
1.5.2.5