[src/trunk]: src/sys/compat Return value pointers should be the last argument.

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac15a9a26423
branches:  trunk
changeset: 822851:ac15a9a26423
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Apr 10 15:04:32 2017 +0000

description:
Return value pointers should be the last argument.

diffstat:

 sys/compat/linux/common/linux_futex.c    |  11 +++++++----
 sys/compat/linux/common/linux_futex.h    |   4 ++--
 sys/compat/linux32/common/linux32_misc.c |   6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r ff3b8d2a3022 -r ac15a9a26423 sys/compat/linux/common/linux_futex.c
--- a/sys/compat/linux/common/linux_futex.c     Mon Apr 10 15:02:40 2017 +0000
+++ b/sys/compat/linux/common/linux_futex.c     Mon Apr 10 15:04:32 2017 +0000
@@ -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_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;
diff -r ff3b8d2a3022 -r ac15a9a26423 sys/compat/linux/common/linux_futex.h
--- a/sys/compat/linux/common/linux_futex.h     Mon Apr 10 15:02:40 2017 +0000
+++ b/sys/compat/linux/common/linux_futex.h     Mon Apr 10 15:04:32 2017 +0000
@@ -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 @@
 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);
 
diff -r ff3b8d2a3022 -r ac15a9a26423 sys/compat/linux32/common/linux32_misc.c
--- a/sys/compat/linux32/common/linux32_misc.c  Mon Apr 10 15:02:40 2017 +0000
+++ b/sys/compat/linux32/common/linux32_misc.c  Mon Apr 10 15:04:32 2017 +0000
@@ -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_to_native_timespec(&ts, &lts);
        }
-       return linux_do_futex(l, &ua, retval, &ts);
+       return linux_do_futex(l, &ua, &ts, retval);
 }
 
 int