switch rt_tgsigqueueinfo to COMPAT_SYSCALL_DEFINE

[firefly-linux-kernel-4.4.55.git] / kernel / compat.c

diff --git a/kernel/compat.c b/kernel/compat.c
index e2a9c4785988b559261b197fd9e213e8cebaba02..cf75a288f0c09ad79c1b7fd78c89d2cfe0f51025 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -381,9 +381,9 @@ static inline void compat_sig_setmask(sigset_t *blocked, compat_sigset_word set)
        memcpy(blocked->sig, &set, sizeof(set));
 }
 
-asmlinkage long compat_sys_sigprocmask(int how,
-                                      compat_old_sigset_t __user *nset,
-                                      compat_old_sigset_t __user *oset)
+COMPAT_SYSCALL_DEFINE3(sigprocmask, int, how,
+                      compat_old_sigset_t __user *, nset,
+                      compat_old_sigset_t __user *, oset)
 {
        old_sigset_t old_set, new_set;
        sigset_t new_blocked;
@@ -993,10 +993,9 @@ sigset_to_compat(compat_sigset_t *compat, const sigset_t *set)
        }
 }
 
-asmlinkage long
-compat_sys_rt_sigtimedwait (compat_sigset_t __user *uthese,
-               struct compat_siginfo __user *uinfo,
-               struct compat_timespec __user *uts, compat_size_t sigsetsize)
+COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese,
+               struct compat_siginfo __user *, uinfo,
+               struct compat_timespec __user *, uts, compat_size_t, sigsetsize)
 {
        compat_sigset_t s32;
        sigset_t s;
@@ -1024,18 +1023,6 @@ compat_sys_rt_sigtimedwait (compat_sigset_t __user *uthese,
        }
 
        return ret;
-
-}
-
-asmlinkage long
-compat_sys_rt_tgsigqueueinfo(compat_pid_t tgid, compat_pid_t pid, int sig,
-                            struct compat_siginfo __user *uinfo)
-{
-       siginfo_t info;
-
-       if (copy_siginfo_from_user32(&info, uinfo))
-               return -EFAULT;
-       return do_rt_tgsigqueueinfo(tgid, pid, sig, &info);
 }
 
 #ifdef __ARCH_WANT_COMPAT_SYS_TIME