diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 15:00:46 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:32:59 -0500 |
| commit | 45cb66f797cd3b892cec6d7faea449c50053410f (patch) | |
| tree | edf8a92b76c5372116a587368c5abfe1e238ec88 /arch/mips | |
| parent | 056a060803cff0d93b13cc2c5cf74909db24a0b9 (diff) | |
| download | op-kernel-dev-45cb66f797cd3b892cec6d7faea449c50053410f.zip op-kernel-dev-45cb66f797cd3b892cec6d7faea449c50053410f.tar.gz | |
mips: switch to generic compat rt_sigpending()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/signal32.c | 17 |
4 files changed, 3 insertions, 19 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 55a2dd7..475e44c 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 14da568..5ab549b 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 06fae3f..22fd9c1 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 e2f0728..a62b918 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) { |
