Browse Source

mips: switch to generic compat rt_sigpending()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 12 years ago
parent
commit
45cb66f797
4 changed files with 3 additions and 19 deletions
  1. 1 0
      arch/mips/Kconfig
  2. 1 1
      arch/mips/kernel/scall64-n32.S
  3. 1 1
      arch/mips/kernel/scall64-o32.S
  4. 0 17
      arch/mips/kernel/signal32.c

+ 1 - 0
arch/mips/Kconfig

@@ -43,6 +43,7 @@ config MIPS
 	select MODULES_USE_ELF_RELA if MODULES && 64BIT
 	select GENERIC_SIGALTSTACK
 	select GENERIC_COMPAT_RT_SIGPROCMASK
+	select GENERIC_COMPAT_RT_SIGPENDING
 
 menu "Machine selection"
 

+ 1 - 1
arch/mips/kernel/scall64-n32.S

@@ -229,7 +229,7 @@ EXPORT(sysn32_call_table)
 	PTR	sys_getsid
 	PTR	sys_capget
 	PTR	sys_capset
-	PTR	sys_32_rt_sigpending		/* 6125 */
+	PTR	compat_sys_rt_sigpending	/* 6125 */
 	PTR	compat_sys_rt_sigtimedwait
 	PTR	sys_32_rt_sigqueueinfo
 	PTR	compat_sys_rt_sigsuspend

+ 1 - 1
arch/mips/kernel/scall64-o32.S

@@ -388,7 +388,7 @@ sys_call_table:
 	PTR	sys32_rt_sigreturn
 	PTR	sys_32_rt_sigaction
 	PTR	compat_sys_rt_sigprocmask 	/* 4195 */
-	PTR	sys_32_rt_sigpending
+	PTR	compat_sys_rt_sigpending
 	PTR	compat_sys_rt_sigtimedwait
 	PTR	sys_32_rt_sigqueueinfo
 	PTR	compat_sys_rt_sigsuspend

+ 0 - 17
arch/mips/kernel/signal32.c

@@ -614,23 +614,6 @@ out:
 	return ret;
 }
 
-SYSCALL_DEFINE2(32_rt_sigpending, compat_sigset_t __user *, uset,
-	unsigned int, sigsetsize)
-{
-	int ret;
-	sigset_t set;
-	mm_segment_t old_fs = get_fs();
-
-	set_fs(KERNEL_DS);
-	ret = sys_rt_sigpending((sigset_t __user *)&set, sigsetsize);
-	set_fs(old_fs);
-
-	if (!ret && put_sigset(&set, uset))
-		return -EFAULT;
-
-	return ret;
-}
-
 SYSCALL_DEFINE3(32_rt_sigqueueinfo, int, pid, int, sig,
 	compat_siginfo_t __user *, uinfo)
 {