switch getrusage() to COMPAT_SYSCALL_DEFINE

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

2 files changed, 14 insertions, 19 deletions

diff --git a/kernel/compat.c b/kernel/compat.c
index 19971d8c7299..c5620d6435e0 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -516,25 +516,6 @@ int put_compat_rusage(const struct rusage *r, struct compat_rusage __user *ru)
         return 0;
 }
 
-asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
-{
-        struct rusage r;
-        int ret;
-        mm_segment_t old_fs = get_fs();
-
-        set_fs(KERNEL_DS);
-        ret = sys_getrusage(who, (struct rusage __user *) &r);
-        set_fs(old_fs);
-
-        if (ret)
-                return ret;
-
-        if (put_compat_rusage(&r, ru))
-                return -EFAULT;
-
-        return 0;
-}
-
 COMPAT_SYSCALL_DEFINE4(wait4,
         compat_pid_t, pid,
         compat_uint_t __user *, stat_addr,
diff --git a/kernel/sys.c b/kernel/sys.c
index 81f56445fba9..fd2b5259ad7a 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1784,6 +1784,20 @@ SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *, ru)
         return getrusage(current, who, ru);
 }
 
+#ifdef CONFIG_COMPAT
+COMPAT_SYSCALL_DEFINE2(getrusage, int, who, struct compat_rusage __user *, ru)
+{
+        struct rusage r;
+
+        if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN &&
+            who != RUSAGE_THREAD)
+                return -EINVAL;
+
+        k_getrusage(current, who, &r);
+        return put_compat_rusage(&r, ru);
+}
+#endif
+
 SYSCALL_DEFINE1(umask, int, mask)
 {
         mask = xchg(&current->fs->umask, mask & S_IRWXUGO);