diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
| commit | 47d1ff6e1a24c0126cd0243b1d6d0a3ffbd7a026 (patch) | |
| tree | b53cd3df68e3a199f6764c619c1a5092d27547e2 /include/linux/rcupdate.h | |
| parent | b79631330a653f568a2ac4eb4a32474c80e3fe77 (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/rcupdate.h')
| -rw-r--r-- | include/linux/rcupdate.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 921340a7b71c..528343e6da51 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -52,6 +52,9 @@ struct rcu_head { void (*func)(struct rcu_head *head); }; +/* Internal to kernel, but needed by rcupreempt.h. */ +extern int rcu_scheduler_active; + #if defined(CONFIG_CLASSIC_RCU) #include <linux/rcuclassic.h> #elif defined(CONFIG_TREE_RCU) @@ -265,6 +268,7 @@ 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 */ |