From e9edac424f5be66e98209e474432d95092924fdf Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 9 May 2008 12:41:17 +0200
Subject: [PATCH] --- yaml --- r: 96234 b: refs/heads/master c:
 41d88d55b2891203e98d1dc0acab949ffd0af078 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/cris/kernel/sys_cris.c | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 7ad98b04dc85..9dcce4006e6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f43ee7e108cecf68cac652d0a3aeedb8131220
+refs/heads/master: 41d88d55b2891203e98d1dc0acab949ffd0af078
diff --git a/trunk/arch/cris/kernel/sys_cris.c b/trunk/arch/cris/kernel/sys_cris.c
index d124066e1728..a79fbd87021b 100644
--- a/trunk/arch/cris/kernel/sys_cris.c
+++ b/trunk/arch/cris/kernel/sys_cris.c
@@ -27,28 +27,6 @@
 #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,