Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return value pointers should be the last argument.

Browse Source
This commit is contained in:
dholland 2017-04-10 15:04:32 +00:00
parent c626d04131
commit d4f30a5920
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/compat/linux/common/linux_futex.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_futex.c,v 1.36 2017/04/09 00:02:30 dholland Exp $ */
/* $NetBSD: linux_futex.c,v 1.37 2017/04/10 15:04:32 dholland Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.36 2017/04/09 00:02:30 dholland Exp $");
__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.37 2017/04/10 15:04:32 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
@ -135,12 +135,15 @@ linux_sys_futex(struct lwp *l, const struct linux_sys_futex_args *uap,
}
linux_to_native_timespec(&ts, &lts);
}
return linux_do_futex(l, uap, retval, &ts);
return linux_do_futex(l, uap, &ts, retval);
}
/*
* Note: TS can't be const because ts2timo destroys it.
*/
int
linux_do_futex(struct lwp *l, const struct linux_sys_futex_args *uap,
register_t *retval, struct timespec *ts)
struct timespec *ts, register_t *retval)
{
/* {
syscallarg(int *) uaddr;

4
sys/compat/linux/common/linux_futex.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_futex.h,v 1.7 2013/04/16 23:03:05 christos Exp $ */
/* $NetBSD: linux_futex.h,v 1.8 2017/04/10 15:04:32 dholland Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -86,7 +86,7 @@ struct linux_robust_list_head {
void release_futexes(struct lwp *);
struct linux_sys_futex_args;
int linux_do_futex(struct lwp *, const struct linux_sys_futex_args *,
register_t *, struct timespec *);
struct timespec *, register_t *);
void linux_futex_init(void);
void linux_futex_fini(void);

6
sys/compat/linux32/common/linux32_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux32_misc.c,v 1.25 2014/11/22 13:12:22 njoly Exp $ */
/* $NetBSD: linux32_misc.c,v 1.26 2017/04/10 15:04:32 dholland Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.25 2014/11/22 13:12:22 njoly Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.26 2017/04/10 15:04:32 dholland Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -262,7 +262,7 @@ linux32_sys_futex(struct lwp *l,
}
linux32_to_native_timespec(&ts, &lts);
}
return linux_do_futex(l, &ua, retval, &ts);
return linux_do_futex(l, &ua, &ts, retval);
}
int