Pull compat into release branch

3 files changed, 3 insertions, 25 deletions

diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 53505bb04771..82a7a0bc5d2e 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -202,7 +202,7 @@ ia32_syscall_table:
         data8 sys32_ptrace
         data8 sys32_alarm
         data8 sys_ni_syscall
-        data8 sys32_pause
+        data8 sys_pause
         data8 compat_sys_utime    /* 30 */
         data8 sys_ni_syscall      /* old stty syscall holder */
         data8 sys_ni_syscall      /* old gtty syscall holder */
@@ -215,7 +215,7 @@ ia32_syscall_table:
         data8 sys_mkdir
         data8 sys_rmdir           /* 40 */
         data8 sys_dup
-        data8 sys32_pipe
+        data8 sys_pipe
         data8 compat_sys_times
         data8 sys_ni_syscall      /* old prof syscall holder */
         data8 sys32_brk           /* 45 */
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index f4430bb4bbdc..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,
         return ret;
 }
 
-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 unsigned long
 sys32_alarm (unsigned int seconds)
 {
@@ -1704,14 +1689,6 @@ out:
 }
 
 asmlinkage int
-sys32_pause (void)
-{
-        current->state = TASK_INTERRUPTIBLE;
-        schedule();
-        return -ERESTARTNOHAND;
-}
-
-asmlinkage int
 sys32_msync (unsigned int start, unsigned int len, int flags)
 {
         unsigned int addr;
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index d535833aab5e..f791576355ad 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -337,6 +337,7 @@
 # define __ARCH_WANT_SYS_NICE
 # define __ARCH_WANT_SYS_OLD_GETRLIMIT
 # define __ARCH_WANT_SYS_OLDUMOUNT
+# define __ARCH_WANT_SYS_PAUSE
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
 # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND