mips: switch to compat_sys_waitid()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
ea536ad4f2
Коммит
1c37ea8277
|
@ -470,7 +470,7 @@ sys_call_table:
|
||||||
PTR compat_sys_mq_notify /* 4275 */
|
PTR compat_sys_mq_notify /* 4275 */
|
||||||
PTR compat_sys_mq_getsetattr
|
PTR compat_sys_mq_getsetattr
|
||||||
PTR sys_ni_syscall /* sys_vserver */
|
PTR sys_ni_syscall /* sys_vserver */
|
||||||
PTR sys_32_waitid
|
PTR compat_sys_waitid
|
||||||
PTR sys_ni_syscall /* available, was setaltroot */
|
PTR sys_ni_syscall /* available, was setaltroot */
|
||||||
PTR sys_add_key /* 4280 */
|
PTR sys_add_key /* 4280 */
|
||||||
PTR sys_request_key
|
PTR sys_request_key
|
||||||
|
|
|
@ -686,32 +686,6 @@ SYSCALL_DEFINE3(32_rt_sigqueueinfo, int, pid, int, sig,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
SYSCALL_DEFINE5(32_waitid, int, which, compat_pid_t, pid,
|
|
||||||
compat_siginfo_t __user *, uinfo, int, options,
|
|
||||||
struct compat_rusage __user *, uru)
|
|
||||||
{
|
|
||||||
siginfo_t info;
|
|
||||||
struct rusage ru;
|
|
||||||
long ret;
|
|
||||||
mm_segment_t old_fs = get_fs();
|
|
||||||
|
|
||||||
info.si_signo = 0;
|
|
||||||
set_fs(KERNEL_DS);
|
|
||||||
ret = sys_waitid(which, pid, (siginfo_t __user *) &info, options,
|
|
||||||
uru ? (struct rusage __user *) &ru : NULL);
|
|
||||||
set_fs(old_fs);
|
|
||||||
|
|
||||||
if (ret < 0 || info.si_signo == 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (uru && (ret = put_compat_rusage(&ru, uru)))
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
BUG_ON(info.si_code & __SI_MASK);
|
|
||||||
info.si_code |= __SI_CHLD;
|
|
||||||
return copy_siginfo_to_user32(uinfo, &info);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int signal32_init(void)
|
static int signal32_init(void)
|
||||||
{
|
{
|
||||||
if (cpu_has_fpu) {
|
if (cpu_has_fpu) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче