Merge branch 'topic/hda' into for-linus

[karo-tx-linux.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index b89c878588a9ecabe59b5bc417e3b8ea660ba0bf..3a48ba5179d55000e4d6b26f5a1eb7bfb5a5891d 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1059,7 +1059,7 @@ SYSCALL_DEFINE2(pipe2, int __user *, fildes, int, flags)
        return error;
 }
 
-asmlinkage long sys_pipe(int __user *fildes)
+SYSCALL_DEFINE1(pipe, int __user *, fildes)
 {
        return sys_pipe2(fildes, 0);
 }