Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 10:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull compat into release branch

Browse Source
This commit is contained in:
Tony Luck 2008-10-17 13:51:01 -07:00
commit 4d4230c27f
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/ia32/ia32_entry.S
View File

@ -202,7 +202,7 @@ ia32_syscall_table:
data8 sys32_ptrace data8 sys32_ptrace
data8 sys32_alarm data8 sys32_alarm
data8 sys_ni_syscall data8 sys_ni_syscall
data8 sys32_pause data8 sys_pause
data8 compat_sys_utime /* 30 */ data8 compat_sys_utime /* 30 */
data8 sys_ni_syscall /* old stty syscall holder */ data8 sys_ni_syscall /* old stty syscall holder */
data8 sys_ni_syscall /* old gtty syscall holder */ data8 sys_ni_syscall /* old gtty syscall holder */
@ -215,7 +215,7 @@ ia32_syscall_table:
data8 sys_mkdir data8 sys_mkdir
data8 sys_rmdir /* 40 */ data8 sys_rmdir /* 40 */
data8 sys_dup data8 sys_dup
data8 sys32_pipe data8 sys_pipe
data8 compat_sys_times data8 compat_sys_times
data8 sys_ni_syscall /* old prof syscall holder */ data8 sys_ni_syscall /* old prof syscall holder */
data8 sys32_brk /* 45 */ data8 sys32_brk /* 45 */

23
arch/ia64/ia32/sys_ia32.c
View File

@ -1098,21 +1098,6 @@ sys32_mremap (unsigned int addr, unsigned int old_len, unsigned int new_len,
return ret; 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 asmlinkage unsigned long
sys32_alarm (unsigned int seconds) sys32_alarm (unsigned int seconds)
{ {
@ -1703,14 +1688,6 @@ out:
return ret; return ret;
} }
asmlinkage int
sys32_pause (void)
{
current->state = TASK_INTERRUPTIBLE;
schedule();
return -ERESTARTNOHAND;
}
asmlinkage int asmlinkage int
sys32_msync (unsigned int start, unsigned int len, int flags) sys32_msync (unsigned int start, unsigned int len, int flags)
{ {

1
arch/ia64/include/asm/unistd.h
View File

@ -337,6 +337,7 @@
# define __ARCH_WANT_SYS_NICE # define __ARCH_WANT_SYS_NICE
# define __ARCH_WANT_SYS_OLD_GETRLIMIT # define __ARCH_WANT_SYS_OLD_GETRLIMIT
# define __ARCH_WANT_SYS_OLDUMOUNT # define __ARCH_WANT_SYS_OLDUMOUNT
# define __ARCH_WANT_SYS_PAUSE
# define __ARCH_WANT_SYS_SIGPENDING # define __ARCH_WANT_SYS_SIGPENDING
# define __ARCH_WANT_SYS_SIGPROCMASK # define __ARCH_WANT_SYS_SIGPROCMASK
# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND