summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-22 08:36:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-22 08:36:42 -0700
commit05f57f50e04aec3c629a652a776497b2c76c0d0b (patch)
tree20d29885d45c612229fc8322c8dd87a6b87dbeae /kernel
parent3ffc3f947de2b64f35f6bc4361e83a2bb9e12c71 (diff)
parent01dcb0443ed89eccf26c2b43f1ea13b368ae740d (diff)
downloadlinux-05f57f50e04aec3c629a652a776497b2c76c0d0b.tar.gz
linux-05f57f50e04aec3c629a652a776497b2c76c0d0b.tar.bz2
linux-05f57f50e04aec3c629a652a776497b2c76c0d0b.zip
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: rcu: fix synchronize_rcu() so that kernel-doc works
Diffstat (limited to 'kernel')
-rw-r--r--kernel/rcupdate.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index f14f372cf6f5..467d5940f624 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -77,6 +77,7 @@ void wakeme_after_rcu(struct rcu_head *head)
* sections are delimited by rcu_read_lock() and rcu_read_unlock(),
* and may be nested.
*/
+void synchronize_rcu(void); /* Makes kernel-doc tools happy */
synchronize_rcu_xxx(synchronize_rcu, call_rcu)
EXPORT_SYMBOL_GPL(synchronize_rcu);