diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 15:51:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 15:51:43 +1000 |
| commit | fa461903f7fa480386faaaea233b29d81caca6a5 (patch) | |
| tree | ae782306fa19199c50ddc161e5d69617a757cfcd /include/linux/rcupdate.h | |
| parent | 8a2fe3a077671738a784311eeed40c4650b287d1 (diff) | |
| parent | eb9c6b238476ba13aa40d0d70db839fbe7d3e97d (diff) | |
Merge commit 'tip/auto-latest'
Conflicts:
arch/x86/include/asm/socket.h
include/linux/rcupdate.h
kernel/fork.c
kernel/trace/trace.h
Diffstat (limited to 'include/linux/rcupdate.h')
| -rw-r--r-- | include/linux/rcupdate.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 19b82b96affa..f8cad2b20778 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -42,12 +42,22 @@ #include <linux/lockdep.h> #include <linux/completion.h> -/* Internal to kernel, but needed by rcupreempt.h. */ +/* Exported common interfaces */ +extern void synchronize_rcu(void); +extern void synchronize_rcu_bh(void); +extern void rcu_barrier(void); +extern void rcu_barrier_bh(void); +extern void rcu_barrier_sched(void); +extern void synchronize_sched_expedited(void); +extern int sched_expedited_torture_stats(char *page); + +/* Internal to kernel */ +extern void rcu_init(void); +extern void rcu_scheduler_starting(void); +extern int rcu_needs_cpu(int cpu); extern int rcu_scheduler_active; -#if defined(CONFIG_CLASSIC_RCU) -#include <linux/rcuclassic.h> -#elif defined(CONFIG_TREE_RCU) +#if defined(CONFIG_TREE_RCU) #include <linux/rcutree.h> #elif defined(CONFIG_PREEMPT_RCU) #include <linux/rcupreempt.h> @@ -250,15 +260,4 @@ extern void call_rcu(struct rcu_head *head, extern void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *head)); -/* Exported common interfaces */ -extern void synchronize_rcu(void); -extern void rcu_barrier(void); -extern void rcu_barrier_bh(void); -extern void rcu_barrier_sched(void); - -/* Internal to kernel */ -extern void rcu_init(void); -extern void rcu_scheduler_starting(void); -extern int rcu_needs_cpu(int cpu); - #endif /* __LINUX_RCUPDATE_H */ |