aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2008-09-01 12:18:10 -0400
committerTony Luck <tony.luck@intel.com>2008-10-17 15:44:26 -0400
commit0f32dc9dc2cfe3e4608fd5cf7afa5d2acb6e3c10 (patch)
tree92630657894a6955f9fc51b698a4c03ba1f976b9
parent9f3541ed2cc5e74a4ace7052701055dedbe46938 (diff)
[IA64] kill sys32_pipe
It's just a duplicate of the generic sys_pipe that still lacks the recently added error handling. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/ia32/ia32_entry.S2
-rw-r--r--arch/ia64/ia32/sys_ia32.c15
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index fa9844305610..82a7a0bc5d2e 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -215,7 +215,7 @@ ia32_syscall_table:
215 data8 sys_mkdir 215 data8 sys_mkdir
216 data8 sys_rmdir /* 40 */ 216 data8 sys_rmdir /* 40 */
217 data8 sys_dup 217 data8 sys_dup
218 data8 sys32_pipe 218 data8 sys_pipe
219 data8 compat_sys_times 219 data8 compat_sys_times
220 data8 sys_ni_syscall /* old prof syscall holder */ 220 data8 sys_ni_syscall /* old prof syscall holder */
221 data8 sys32_brk /* 45 */ 221 data8 sys32_brk /* 45 */
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 0fd06b471bc1..800a7174a5cb 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -1098,21 +1098,6 @@ sys32_mremap (unsigned int addr, unsigned int old_len, unsigned int new_len,
1098 return ret; 1098 return ret;
1099} 1099}
1100 1100
1101asmlinkage long
1102sys32_pipe (int __user *fd)
1103{
1104 int retval;
1105 int fds[2];
1106
1107 retval = do_pipe_flags(fds, 0);
1108 if (retval)
1109 goto out;
1110 if (copy_to_user(fd, fds, sizeof(fds)))
1111 retval = -EFAULT;
1112 out:
1113 return retval;
1114}
1115
1116asmlinkage unsigned long 1101asmlinkage unsigned long
1117sys32_alarm (unsigned int seconds) 1102sys32_alarm (unsigned int seconds)
1118{ 1103{