Pull compat into release branch (4d4230c2) · Commits · 戴 / test

arch/ia64/ia32/ia32_entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */

+0 −23

Original line number	Diff line number	Diff line
		@@ -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)
		{
		@@ -1703,14 +1688,6 @@ out:
		return ret;
		}

		asmlinkage int
		sys32_pause (void)
		{
		current->state = TASK_INTERRUPTIBLE;
		schedule();
		return -ERESTARTNOHAND;
		}

		asmlinkage int
		sys32_msync (unsigned int start, unsigned int len, int flags)
		{

+1 −0

Original line number	Diff line number	Diff line
		@@ -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