From b79e0cfb4f8836557217d6e5ad4f0d72185fb89d Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 9 May 2008 14:44:02 +0200
Subject: [PATCH] --- yaml --- r: 96235 b: refs/heads/master c:
 9b013c2820c409ff84871e55e407ec2181782773 h: refs/heads/master i:   96233:
 37ef41bf7f643024b709d7782c2bda8c6be54fab   96231:
 cf444e89e5b74d081eec06c0d1632b30eae0b3ab v: v3

---
 [refs]                            |  2 +-
 trunk/arch/m32r/kernel/sys_m32r.c | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 9dcce4006e6c..84d92676470d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41d88d55b2891203e98d1dc0acab949ffd0af078
+refs/heads/master: 9b013c2820c409ff84871e55e407ec2181782773
diff --git a/trunk/arch/m32r/kernel/sys_m32r.c b/trunk/arch/m32r/kernel/sys_m32r.c
index 319c79720b8a..305ac852bbed 100644
--- a/trunk/arch/m32r/kernel/sys_m32r.c
+++ b/trunk/arch/m32r/kernel/sys_m32r.c
@@ -76,29 +76,6 @@ asmlinkage int sys_tas(int __user *addr)
 	return oldval;
 }
 
-/*
- * 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 r0, unsigned long r1, unsigned long r2,
-	unsigned long r3, unsigned long r4, unsigned long r5,
-	unsigned long r6, struct pt_regs regs)
-{
-	int fd[2];
-	int error;
-
-	error = do_pipe(fd);
-	if (!error) {
-		if (copy_to_user((void __user *)r0, fd, 2*sizeof(int))) {
-			sys_close(fd[0]);
-			sys_close(fd[1]);
-			error = -EFAULT;
-		}
-	}
-	return error;
-}
-
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
 	unsigned long prot, unsigned long flags,
 	unsigned long fd, unsigned long pgoff)