From 03852c987866f5c01f6758090c2662a1c6c370c4 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Thu, 6 Aug 2009 15:58:12 -0700
Subject: [PATCH] --- yaml --- r: 158649 b: refs/heads/master c:
 4c711576b90cc36c13b94816a953a8de6a53d03c h: refs/heads/master i:   158647:
 f1fc178ab0a698a7ee182d8911a85251b41598b8 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/ia32/ia32entry.S |  2 +-
 trunk/arch/x86/ia32/sys_ia32.c  | 14 --------------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 149100969e33..ee7e0982a887 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72c4d8530244264317a662de9a55cc47e6c8e9df
+refs/heads/master: 4c711576b90cc36c13b94816a953a8de6a53d03c
diff --git a/trunk/arch/x86/ia32/ia32entry.S b/trunk/arch/x86/ia32/ia32entry.S
index e590261ba059..ba331bfd1112 100644
--- a/trunk/arch/x86/ia32/ia32entry.S
+++ b/trunk/arch/x86/ia32/ia32entry.S
@@ -537,7 +537,7 @@ ia32_sys_call_table:
 	.quad sys_mkdir
 	.quad sys_rmdir		/* 40 */
 	.quad sys_dup
-	.quad sys32_pipe
+	.quad sys_pipe
 	.quad compat_sys_times
 	.quad quiet_ni_syscall			/* old prof syscall holder */
 	.quad sys_brk		/* 45 */
diff --git a/trunk/arch/x86/ia32/sys_ia32.c b/trunk/arch/x86/ia32/sys_ia32.c
index 085a8c35f149..9f5527198825 100644
--- a/trunk/arch/x86/ia32/sys_ia32.c
+++ b/trunk/arch/x86/ia32/sys_ia32.c
@@ -189,20 +189,6 @@ asmlinkage long sys32_mprotect(unsigned long start, size_t len,
 	return sys_mprotect(start, len, prot);
 }
 
-asmlinkage long sys32_pipe(int __user *fd)
-{
-	int retval;
-	int fds[2];
-
-	retval = do_pipe_flags(fds, 0);
-	if (retval)
-		goto out;
-	if (copy_to_user(fd, fds, sizeof(fds)))
-		retval = -EFAULT;
-out:
-	return retval;
-}
-
 asmlinkage long sys32_rt_sigaction(int sig, struct sigaction32 __user *act,
 				   struct sigaction32 __user *oact,
 				   unsigned int sigsetsize)