convert futex compat syscalls to COMPAT_SYSCALL_DEFINE

Al Viro · Al Viro · commit 90caf58dad77 · 2013-02-03T15:09:24.000-05:00
ppc is stepping into a nasal daemon territory a bit...

Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
@@ -11,6 +11,7 @@
 #include <linux/nsproxy.h>
 #include <linux/futex.h>
 #include <linux/ptrace.h>
+#include <linux/syscalls.h>
 
 #include <asm/uaccess.h>
 
@@ -116,9 +117,9 @@ void compat_exit_robust_list(struct task_struct *curr)
 	}
 }
 
-asmlinkage long
-compat_sys_set_robust_list(struct compat_robust_list_head __user *head,
-			   compat_size_t len)
+COMPAT_SYSCALL_DEFINE2(set_robust_list,
+		struct compat_robust_list_head __user *, head,
+		compat_size_t, len)
 {
 	if (!futex_cmpxchg_enabled)
 		return -ENOSYS;
@@ -131,9 +132,9 @@ compat_sys_set_robust_list(struct compat_robust_list_head __user *head,
 	return 0;
 }
 
-asmlinkage long
-compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
-			   compat_size_t __user *len_ptr)
+COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,
+			compat_uptr_t __user *, head_ptr,
+			compat_size_t __user *, len_ptr)
 {
 	struct compat_robust_list_head __user *head;
 	unsigned long ret;
@@ -172,9 +173,9 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
 	return ret;
 }
 
-asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
-		struct compat_timespec __user *utime, u32 __user *uaddr2,
-		u32 val3)
+COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
+		struct compat_timespec __user *, utime, u32 __user *, uaddr2,
+		u32, val3)
 {
 	struct timespec ts;
 	ktime_t t, *tp = NULL;

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`#include <linux/nsproxy.h>`
`12`	`12`	`#include <linux/futex.h>`
`13`	`13`	`#include <linux/ptrace.h>`
	`14`	`+#include <linux/syscalls.h>`
`14`	`15`
`15`	`16`	`#include <asm/uaccess.h>`
`16`	`17`
`@@ -116,9 +117,9 @@ void compat_exit_robust_list(struct task_struct *curr)`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
`119`		`-asmlinkage long`
`120`		`-compat_sys_set_robust_list(struct compat_robust_list_head __user *head,`
`121`		`- compat_size_t len)`
	`120`	`+COMPAT_SYSCALL_DEFINE2(set_robust_list,`
	`121`	`+ struct compat_robust_list_head __user *, head,`
	`122`	`+ compat_size_t, len)`
`122`	`123`	`{`
`123`	`124`	`if (!futex_cmpxchg_enabled)`
`124`	`125`	`return -ENOSYS;`
`@@ -131,9 +132,9 @@ compat_sys_set_robust_list(struct compat_robust_list_head __user *head,`
`131`	`132`	`return 0;`
`132`	`133`	`}`
`133`	`134`
`134`		`-asmlinkage long`
`135`		`-compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,`
`136`		`- compat_size_t __user *len_ptr)`
	`135`	`+COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid,`
	`136`	`+ compat_uptr_t __user *, head_ptr,`
	`137`	`+ compat_size_t __user *, len_ptr)`
`137`	`138`	`{`
`138`	`139`	`struct compat_robust_list_head __user *head;`
`139`	`140`	`unsigned long ret;`
`@@ -172,9 +173,9 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,`
`172`	`173`	`return ret;`
`173`	`174`	`}`
`174`	`175`
`175`		`-asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,`
`176`		`- struct compat_timespec __user utime, u32 __user uaddr2,`
`177`		`- u32 val3)`
	`176`	`+COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,`
	`177`	`+ struct compat_timespec __user , utime, u32 __user , uaddr2,`
	`178`	`+ u32, val3)`
`178`	`179`	`{`
`179`	`180`	`struct timespec ts;`
`180`	`181`	`ktime_t t, *tp = NULL;`