diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 23:16:10 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:24 -0500 |
commit | 90caf58dad77a4021e9dade5d051756cea2a2cd7 (patch) | |
tree | 04155a65fe182aba3eb4e49e6e5a98bd78c19c77 /kernel | |
parent | f482e1b4a4abf926507a4c1c6317acd3e7aa61b7 (diff) |
convert futex compat syscalls to COMPAT_SYSCALL_DEFINE
ppc is stepping into a nasal daemon territory a bit...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/futex_compat.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 83e368b005fc..0f016982f975 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/nsproxy.h> | 11 | #include <linux/nsproxy.h> |
12 | #include <linux/futex.h> | 12 | #include <linux/futex.h> |
13 | #include <linux/ptrace.h> | 13 | #include <linux/ptrace.h> |
14 | #include <linux/syscalls.h> | ||
14 | 15 | ||
15 | #include <asm/uaccess.h> | 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_SYSCALL_DEFINE2(set_robust_list, |
120 | compat_sys_set_robust_list(struct compat_robust_list_head __user *head, | 121 | struct compat_robust_list_head __user *, head, |
121 | compat_size_t len) | 122 | compat_size_t, len) |
122 | { | 123 | { |
123 | if (!futex_cmpxchg_enabled) | 124 | if (!futex_cmpxchg_enabled) |
124 | return -ENOSYS; | 125 | return -ENOSYS; |
@@ -131,9 +132,9 @@ compat_sys_set_robust_list(struct compat_robust_list_head __user *head, | |||
131 | return 0; | 132 | return 0; |
132 | } | 133 | } |
133 | 134 | ||
134 | asmlinkage long | 135 | COMPAT_SYSCALL_DEFINE3(get_robust_list, int, pid, |
135 | compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, | 136 | compat_uptr_t __user *, head_ptr, |
136 | compat_size_t __user *len_ptr) | 137 | compat_size_t __user *, len_ptr) |
137 | { | 138 | { |
138 | struct compat_robust_list_head __user *head; | 139 | struct compat_robust_list_head __user *head; |
139 | unsigned long ret; | 140 | unsigned long ret; |
@@ -172,9 +173,9 @@ err_unlock: | |||
172 | return ret; | 173 | return ret; |
173 | } | 174 | } |
174 | 175 | ||
175 | asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, | 176 | COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, |
176 | struct compat_timespec __user *utime, u32 __user *uaddr2, | 177 | struct compat_timespec __user *, utime, u32 __user *, uaddr2, |
177 | u32 val3) | 178 | u32, val3) |
178 | { | 179 | { |
179 | struct timespec ts; | 180 | struct timespec ts; |
180 | ktime_t t, *tp = NULL; | 181 | ktime_t t, *tp = NULL; |