mips: switch to generic compat rt_sigprocmask()

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a8a41e091d04dd1493651656db3816cb240ef858..55a2dd700237b94dc8c2e69f6e3e2be89822260c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -42,6 +42,7 @@ config MIPS
        select MODULES_USE_ELF_REL if MODULES
        select MODULES_USE_ELF_RELA if MODULES && 64BIT
        select GENERIC_SIGALTSTACK
+       select GENERIC_COMPAT_RT_SIGPROCMASK
 
 menu "Machine selection"
 

diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index ab34b32f1e344bb8e535c50266668337de2d99be..14da5687746c0c91ab04978ab2df026ad879e053 100644 (file)
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -118,7 +118,7 @@ EXPORT(sysn32_call_table)
        PTR     sys_munmap
        PTR     sys_brk
        PTR     sys_32_rt_sigaction
-       PTR     sys_32_rt_sigprocmask
+       PTR     compat_sys_rt_sigprocmask
        PTR     compat_sys_ioctl                /* 6015 */
        PTR     sys_pread64
        PTR     sys_pwrite64

diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 144d904cdb2202e61bc22630f25415d9b7da7899..06fae3f394073f068cd7dc0fd9da50ff64953c6f 100644 (file)
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -387,7 +387,7 @@ sys_call_table:
        PTR     sys_prctl
        PTR     sys32_rt_sigreturn
        PTR     sys_32_rt_sigaction
-       PTR     sys_32_rt_sigprocmask           /* 4195 */
+       PTR     compat_sys_rt_sigprocmask       /* 4195 */
        PTR     sys_32_rt_sigpending
        PTR     compat_sys_rt_sigtimedwait
        PTR     sys_32_rt_sigqueueinfo

diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index ff6146dddf5f8f35799a16c40224dbc4be83780d..e2f0728c8cc001d392e1d4290df20ce59e128d40 100644 (file)
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -614,28 +614,6 @@ out:
        return ret;
 }
 
-SYSCALL_DEFINE4(32_rt_sigprocmask, int, how, compat_sigset_t __user *, set,
-       compat_sigset_t __user *, oset, unsigned int, sigsetsize)
-{
-       sigset_t old_set, new_set;
-       int ret;
-       mm_segment_t old_fs = get_fs();
-
-       if (set && get_sigset(&new_set, set))
-               return -EFAULT;
-
-       set_fs(KERNEL_DS);
-       ret = sys_rt_sigprocmask(how, set ? (sigset_t __user *)&new_set : NULL,
-                                oset ? (sigset_t __user *)&old_set : NULL,
-                                sigsetsize);
-       set_fs(old_fs);
-
-       if (!ret && oset && put_sigset(&old_set, oset))
-               return -EFAULT;
-
-       return ret;
-}
-
 SYSCALL_DEFINE2(32_rt_sigpending, compat_sigset_t __user *, uset,
        unsigned int, sigsetsize)
 {