Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

[mv-sheeva.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index b6e8b8632e2f973718dda48d0247e961569105df..b58208f1640a00eecbb0c760469a15b8fe31f6c3 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3243,7 +3243,7 @@ void block_sync_page(struct page *page)
  * Use of bdflush() is deprecated and will be removed in a future kernel.
  * The `pdflush' kernel threads fully replace bdflush daemons and this call.
  */
-asmlinkage long sys_bdflush(int func, long data)
+SYSCALL_DEFINE2(bdflush, int, func, long, data)
 {
        static int msg_count;