]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
cris: kill sys_pipe implementation
authorChristoph Hellwig <hch@lst.de>
Fri, 9 May 2008 10:41:17 +0000 (12:41 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 May 2008 15:03:03 +0000 (08:03 -0700)
The cris implementation of sys_pipe only differs from the generic one
by taking the BKL before calling do_pipe which isn't not nessecary.

Just kill the cris implementation and use the generic one.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/cris/kernel/sys_cris.c

index d124066e1728880b29dc8778d103b5fed1309a1b..a79fbd87021b02cf03663f7a06d680a58a24ceac 100644 (file)
 #include <asm/uaccess.h>
 #include <asm/segment.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long __user * fildes)
-{
-        int fd[2];
-        int error;
-
-        lock_kernel();
-        error = do_pipe(fd);
-        unlock_kernel();
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int))) {
-                       sys_close(fd[0]);
-                       sys_close(fd[1]);
-                        error = -EFAULT;
-               }
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long
 do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,