switch signalfd{,4}() to COMPAT_SYSCALL_DEFINE

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

2 files changed, 31 insertions, 30 deletions

diff --git a/fs/compat.c b/fs/compat.c
index fe40fde29111..cc09312f9aed 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1707,36 +1707,6 @@ asmlinkage long compat_sys_epoll_pwait(int epfd,
 
 #endif /* CONFIG_EPOLL */
 
-#ifdef CONFIG_SIGNALFD
-
-asmlinkage long compat_sys_signalfd4(int ufd,
-                                     const compat_sigset_t __user *sigmask,
-                                     compat_size_t sigsetsize, int flags)
-{
-        compat_sigset_t ss32;
-        sigset_t tmp;
-        sigset_t __user *ksigmask;
-
-        if (sigsetsize != sizeof(compat_sigset_t))
-                return -EINVAL;
-        if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
-                return -EFAULT;
-        sigset_from_compat(&tmp, &ss32);
-        ksigmask = compat_alloc_user_space(sizeof(sigset_t));
-        if (copy_to_user(ksigmask, &tmp, sizeof(sigset_t)))
-                return -EFAULT;
-
-        return sys_signalfd4(ufd, ksigmask, sizeof(sigset_t), flags);
-}
-
-asmlinkage long compat_sys_signalfd(int ufd,
-                                    const compat_sigset_t __user *sigmask,
-                                    compat_size_t sigsetsize)
-{
-        return compat_sys_signalfd4(ufd, sigmask, sigsetsize, 0);
-}
-#endif /* CONFIG_SIGNALFD */
-
 #ifdef CONFIG_FHANDLE
 /*
  * Exactly like fs/open.c:sys_open_by_handle_at(), except that it
diff --git a/fs/signalfd.c b/fs/signalfd.c
index b53486961735..424b7b65321f 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -30,6 +30,7 @@
 #include <linux/signalfd.h>
 #include <linux/syscalls.h>
 #include <linux/proc_fs.h>
+#include <linux/compat.h>
 
 void signalfd_cleanup(struct sighand_struct *sighand)
 {
@@ -311,3 +312,33 @@ SYSCALL_DEFINE3(signalfd, int, ufd, sigset_t __user *, user_mask,
 {
         return sys_signalfd4(ufd, user_mask, sizemask, 0);
 }
+
+#ifdef CONFIG_COMPAT
+COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd,
+                     const compat_sigset_t __user *,sigmask,
+                     compat_size_t, sigsetsize,
+                     int, flags)
+{
+        compat_sigset_t ss32;
+        sigset_t tmp;
+        sigset_t __user *ksigmask;
+
+        if (sigsetsize != sizeof(compat_sigset_t))
+                return -EINVAL;
+        if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
+                return -EFAULT;
+        sigset_from_compat(&tmp, &ss32);
+        ksigmask = compat_alloc_user_space(sizeof(sigset_t));
+        if (copy_to_user(ksigmask, &tmp, sizeof(sigset_t)))
+                return -EFAULT;
+
+        return sys_signalfd4(ufd, ksigmask, sizeof(sigset_t), flags);
+}
+
+COMPAT_SYSCALL_DEFINE3(signalfd, int, ufd,
+                     const compat_sigset_t __user *,sigmask,
+                     compat_size_t, sigsetsize)
+{
+        return compat_sys_signalfd4(ufd, sigmask, sigsetsize, 0);
+}
+#endif