diff options
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 17 | 
1 files changed, 8 insertions, 9 deletions
| diff --git a/kernel/futex.c b/kernel/futex.c index 002aa189eb09..f89d373a9c6d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -1733,9 +1733,8 @@ pi_faulted: | |||
| 1733 | * @head: pointer to the list-head | 1733 | * @head: pointer to the list-head | 
| 1734 | * @len: length of the list-head, as userspace expects | 1734 | * @len: length of the list-head, as userspace expects | 
| 1735 | */ | 1735 | */ | 
| 1736 | asmlinkage long | 1736 | SYSCALL_DEFINE2(set_robust_list, struct robust_list_head __user *, head, | 
| 1737 | sys_set_robust_list(struct robust_list_head __user *head, | 1737 | size_t, len) | 
| 1738 | size_t len) | ||
| 1739 | { | 1738 | { | 
| 1740 | if (!futex_cmpxchg_enabled) | 1739 | if (!futex_cmpxchg_enabled) | 
| 1741 | return -ENOSYS; | 1740 | return -ENOSYS; | 
| @@ -1756,9 +1755,9 @@ sys_set_robust_list(struct robust_list_head __user *head, | |||
| 1756 | * @head_ptr: pointer to a list-head pointer, the kernel fills it in | 1755 | * @head_ptr: pointer to a list-head pointer, the kernel fills it in | 
| 1757 | * @len_ptr: pointer to a length field, the kernel fills in the header size | 1756 | * @len_ptr: pointer to a length field, the kernel fills in the header size | 
| 1758 | */ | 1757 | */ | 
| 1759 | asmlinkage long | 1758 | SYSCALL_DEFINE3(get_robust_list, int, pid, | 
| 1760 | sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr, | 1759 | struct robust_list_head __user * __user *, head_ptr, | 
| 1761 | size_t __user *len_ptr) | 1760 | size_t __user *, len_ptr) | 
| 1762 | { | 1761 | { | 
| 1763 | struct robust_list_head __user *head; | 1762 | struct robust_list_head __user *head; | 
| 1764 | unsigned long ret; | 1763 | unsigned long ret; | 
| @@ -1978,9 +1977,9 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, | |||
| 1978 | } | 1977 | } | 
| 1979 | 1978 | ||
| 1980 | 1979 | ||
| 1981 | asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val, | 1980 | SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, | 
| 1982 | struct timespec __user *utime, u32 __user *uaddr2, | 1981 | struct timespec __user *, utime, u32 __user *, uaddr2, | 
| 1983 | u32 val3) | 1982 | u32, val3) | 
| 1984 | { | 1983 | { | 
| 1985 | struct timespec ts; | 1984 | struct timespec ts; | 
| 1986 | ktime_t t, *tp = NULL; | 1985 | ktime_t t, *tp = NULL; | 
