From 38ea4ff88835bc6a7541b937df6a1a2c41b33d86 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 23 Dec 2012 14:56:40 -0500
Subject: [PATCH] --- yaml --- r: 348921 b: refs/heads/master c:
 8d9807b109497ca41d363dc7b6ff2bb6c0d52524 h: refs/heads/master i:   348919:
 d49b45258c2aaef200eea78fbb3b3f3b7c995d39 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/compat.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 11c7e27e8a03..6794f0fbbdeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90228fc110303549aa1d4d86083bf585df8624c3
+refs/heads/master: 8d9807b109497ca41d363dc7b6ff2bb6c0d52524
diff --git a/trunk/kernel/compat.c b/trunk/kernel/compat.c
index f6150e92dfc9..0770ac57c62b 100644
--- a/trunk/kernel/compat.c
+++ b/trunk/kernel/compat.c
@@ -535,9 +535,11 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
 	return 0;
 }
 
-asmlinkage long
-compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
-	struct compat_rusage __user *ru)
+COMPAT_SYSCALL_DEFINE4(wait4,
+	compat_pid_t, pid,
+	compat_uint_t __user *, stat_addr,
+	int, options,
+	struct compat_rusage __user *, ru)
 {
 	if (!ru) {
 		return sys_wait4(pid, stat_addr, options, NULL);
@@ -564,9 +566,10 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
 	}
 }
 
-asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
-		struct compat_siginfo __user *uinfo, int options,
-		struct compat_rusage __user *uru)
+COMPAT_SYSCALL_DEFINE5(waitid,
+		int, which, compat_pid_t, pid,
+		struct compat_siginfo __user *, uinfo, int, options,
+		struct compat_rusage __user *, uru)
 {
 	siginfo_t info;
 	struct rusage ru;