mips: switch to generic compat rt_sigpending()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 3 insertions, 19 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 55a2dd700237..475e44c8fd2e 100644
--- a/arch/mips/Kconfig
+++ b/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"
 
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 14da5687746c..5ab549b264b7 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/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
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 06fae3f39407..22fd9c13f37b 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/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
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index e2f0728c8cc0..a62b918d6835 100644
--- a/arch/mips/kernel/signal32.c
+++ b/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)
 {