From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + xtensa-use-generic-sys_pipe.patch added to -mm tree Date: Fri, 24 Jul 2009 14:29:13 -0700 Message-ID: <200907242129.n6OLTDGb024010@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:38912 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbZGXV36 (ORCPT ); Fri, 24 Jul 2009 17:29:58 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: xiyou.wangcong@gmail.com, amwang@redhat.com, chris@zankel.net, jw@emlix.com, viro@zeniv.linux.org.uk The patch titled xtensa: use generic sys_pipe() has been added to the -mm tree. Its filename is xtensa-use-generic-sys_pipe.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: xtensa: use generic sys_pipe() From: Amerigo Wang As suggested by Al, we can use the generic sys_pipe() instead of xtensa_pipe() for xtensa. Signed-off-by: WANG Cong Reviewed-by: Johannes Weiner Cc: Al Viro Cc: Chris Zankel Signed-off-by: Andrew Morton --- arch/xtensa/include/asm/syscall.h | 1 - arch/xtensa/include/asm/unistd.h | 2 +- arch/xtensa/kernel/syscall.c | 18 ------------------ 3 files changed, 1 insertion(+), 20 deletions(-) diff -puN arch/xtensa/include/asm/syscall.h~xtensa-use-generic-sys_pipe arch/xtensa/include/asm/syscall.h --- a/arch/xtensa/include/asm/syscall.h~xtensa-use-generic-sys_pipe +++ a/arch/xtensa/include/asm/syscall.h @@ -12,7 +12,6 @@ struct pt_regs; struct sigaction; asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*); asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*); -asmlinkage long xtensa_pipe(int __user *); asmlinkage long xtensa_mmap2(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); asmlinkage long xtensa_ptrace(long, long, long, long); diff -puN arch/xtensa/include/asm/unistd.h~xtensa-use-generic-sys_pipe arch/xtensa/include/asm/unistd.h --- a/arch/xtensa/include/asm/unistd.h~xtensa-use-generic-sys_pipe +++ a/arch/xtensa/include/asm/unistd.h @@ -94,7 +94,7 @@ __SYSCALL( 35, sys_readlink, 3) #define __NR_mknod 36 __SYSCALL( 36, sys_mknod, 3) #define __NR_pipe 37 -__SYSCALL( 37, xtensa_pipe, 1) +__SYSCALL( 37, sys_pipe, 1) #define __NR_unlink 38 __SYSCALL( 38, sys_unlink, 1) #define __NR_rmdir 39 diff -puN arch/xtensa/kernel/syscall.c~xtensa-use-generic-sys_pipe arch/xtensa/kernel/syscall.c --- a/arch/xtensa/kernel/syscall.c~xtensa-use-generic-sys_pipe +++ a/arch/xtensa/kernel/syscall.c @@ -39,24 +39,6 @@ syscall_t sys_call_table[__NR_syscall_co #include }; -/* - * xtensa_pipe() is the normal C calling standard for creating a pipe. It's not - * the way unix traditional does this, though. - */ - -asmlinkage long xtensa_pipe(int __user *userfds) -{ - int fd[2]; - int error; - - error = do_pipe_flags(fd, 0); - if (!error) { - if (copy_to_user(userfds, fd, 2 * sizeof(int))) - error = -EFAULT; - } - return error; -}