summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:12:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:12:20 -0700
commitfefcfd431b5181615e7da628e34c5227c895b85a (patch)
tree0da42ba9d66c6e9a12b6352b5be41f2fa023c91b /include
parent37c2ca24119f7dd89cbbb43833df1e6c5fb3417b (diff)
parent89061d3d58e1f0742139605dc6a7950aa1ecc019 (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')
-rw-r--r--include/linux/rcutree.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index 46e9ab3ee6e..9642c6bcb39 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -76,11 +76,7 @@ static inline void __rcu_read_unlock_bh(void)
extern void call_rcu_sched(struct rcu_head *head,
void (*func)(struct rcu_head *rcu));
-
-static inline void synchronize_rcu_expedited(void)
-{
- synchronize_sched_expedited();
-}
+extern void synchronize_rcu_expedited(void);
static inline void synchronize_rcu_bh_expedited(void)
{