diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:12:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 11:12:20 -0400 |
| commit | fefcfd431b5181615e7da628e34c5227c895b85a (patch) | |
| tree | 0da42ba9d66c6e9a12b6352b5be41f2fa023c91b /include/linux | |
| parent | 37c2ca24119f7dd89cbbb43833df1e6c5fb3417b (diff) | |
| parent | 89061d3d58e1f0742139605dc6a7950aa1ecc019 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futex: Move drop_futex_key_refs out of spinlock'ed region
rcu: Fix TREE_PREEMPT_RCU CPU_HOTPLUG bad-luck hang
rcu: Stopgap fix for synchronize_rcu_expedited() for TREE_PREEMPT_RCU
rcu: Prevent RCU IPI storms in presence of high call_rcu() load
futex: Check for NULL keys in match_futex
futex: Handle spurious wake up
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rcutree.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h index 46e9ab3ee6e1..9642c6bcb399 100644 --- a/include/linux/rcutree.h +++ b/include/linux/rcutree.h | |||
| @@ -76,11 +76,7 @@ static inline void __rcu_read_unlock_bh(void) | |||
| 76 | 76 | ||
| 77 | extern void call_rcu_sched(struct rcu_head *head, | 77 | extern void call_rcu_sched(struct rcu_head *head, |
| 78 | void (*func)(struct rcu_head *rcu)); | 78 | void (*func)(struct rcu_head *rcu)); |
| 79 | 79 | extern void synchronize_rcu_expedited(void); | |
| 80 | static inline void synchronize_rcu_expedited(void) | ||
| 81 | { | ||
| 82 | synchronize_sched_expedited(); | ||
| 83 | } | ||
| 84 | 80 | ||
| 85 | static inline void synchronize_rcu_bh_expedited(void) | 81 | static inline void synchronize_rcu_bh_expedited(void) |
| 86 | { | 82 | { |