Wed Jun 21 21:04:03 2023 UTC ()

Pull up following revision(s) (requested by riastradh in ticket #1836):

	sys/compat/linux/arch/i386/linux_machdep.c: revision 1.168
	sys/compat/sunos/sunos_misc.c: revision 1.177
	sys/compat/netbsd32/netbsd32_compat_50.c: revision 1.52
	sys/compat/common/kern_resource_43.c: revision 1.23
	sys/compat/netbsd32/netbsd32_conv.h: revision 1.46
	sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.35
	sys/compat/common/vfs_syscalls_12.c: revision 1.38
	sys/compat/ultrix/ultrix_misc.c: revision 1.126
	sys/compat/common/kern_sig_43.c: revision 1.37
	sys/compat/linux/common/linux_mtio.c: revision 1.8
	sys/compat/freebsd/freebsd_misc.c: revision 1.34
	sys/compat/linux/common/linux_olduname.c: revision 1.67
	sys/compat/linux/arch/mips/linux_machdep.c: revision 1.44
	sys/compat/freebsd/freebsd_sched.c: revision 1.23
	sys/compat/ossaudio/ossaudio.c: revision 1.84
	sys/compat/sys/time_types.h: revision 1.6
	sys/compat/linux/arch/powerpc/linux_machdep.c: revision 1.51
	sys/compat/linux/common/linux_file.c: revision 1.119
	sys/compat/linux/arch/arm/linux_machdep.c: revision 1.34
	sys/compat/netbsd32/netbsd32_wait.c: revision 1.25
	sys/compat/linux32/common/linux32_time.c: revision 1.38
	sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.33
	sys/compat/linux/arch/alpha/linux_machdep.c: revision 1.52
	sys/compat/linux32/arch/amd64/linux32_machdep.c: revision 1.46
	sys/compat/netbsd32/netbsd32_compat_12.c: revision 1.36
	sys/compat/ultrix/ultrix_ioctl.c: revision 1.39
	sys/compat/linux/common/linux_misc.c: revision 1.252
	sys/compat/linux/common/linux_hdio.c: revision 1.19
	sys/compat/sunos/sunos_ioctl.c: revision 1.71
	sys/compat/linux/common/linux_sched.c: revision 1.79
	sys/compat/common/kern_info_43.c: revision 1.40
	sys/compat/linux32/common/linux32_exec_elf32.c: revision 1.20
	sys/compat/linux/common/linux_socket.c: revision 1.153
	sys/compat/linux/arch/amd64/linux_machdep.c: revision 1.60
	sys/compat/common/vfs_syscalls_43.c: revision 1.68
	sys/compat/linux/arch/powerpc/linux_exec_powerpc.c: revision 1.25
	sys/compat/netbsd32/netbsd32_ptrace.c: revision 1.9
	sys/compat/common/kern_time_50.c: revision 1.37
	sys/compat/netbsd32/netbsd32_compat_20.c: revision 1.42
	sys/compat/linux/common/linux_cdrom.c: revision 1.28
	sys/compat/linux/arch/m68k/linux_machdep.c: revision 1.43
	sys/compat/common/kern_info_09.c: revision 1.22
	sys/compat/linux32/common/linux32_resource.c: revision 1.12
	sys/compat/linux/common/linux_oldolduname.c: revision 1.67
	sys/compat/netbsd32/netbsd32_nfssvc.c: revision 1.8
	sys/compat/linux32/common/linux32_signal.c: revision 1.21
	sys/compat/common/kern_sig_13.c: revision 1.22
	sys/compat/sunos32/sunos32_ioctl.c: revision 1.36
	sys/compat/netbsd32/netbsd32_compat_43.c: revision 1.62
	sys/compat/linux/arch/arm/linux_ptrace.c: revision 1.23
	sys/compat/netbsd32/netbsd32_time.c: revision 1.56
	sys/compat/linux/common/linux_signal.c: revision 1.84
	sys/compat/netbsd32/netbsd32_signal.c: revision 1.52
	sys/compat/sunos32/sunos32_misc.c: revision 1.85
	sys/compat/linux/common/linux_time.c: revision 1.40
	sys/compat/linux/common/linux_fdio.c: revision 1.14
	sys/compat/common/vfs_syscalls_30.c: revision 1.43

sys/compat: Memset zero before copyout.

Just in case of uninitialized padding which would lead to kernel
stack disclosure.  If the compiler can prove the memset redundant
then it can optimize it away; otherwise better safe than sorry.


(martin)

diff -r1.20 -r1.20.90.1 src/sys/compat/common/kern_info_09.c
diff -r1.35 -r1.35.22.1 src/sys/compat/common/kern_info_43.c
diff -r1.21 -r1.21.90.1 src/sys/compat/common/kern_resource_43.c
diff -r1.20 -r1.20.50.1 src/sys/compat/common/kern_sig_13.c
diff -r1.34.50.1 -r1.34.50.2 src/sys/compat/common/kern_sig_43.c
diff -r1.31 -r1.31.10.1 src/sys/compat/common/kern_time_50.c
diff -r1.33.8.2 -r1.33.8.3 src/sys/compat/common/vfs_syscalls_12.c
diff -r1.36.12.1 -r1.36.12.2 src/sys/compat/common/vfs_syscalls_30.c
diff -r1.59.8.3 -r1.59.8.4 src/sys/compat/common/vfs_syscalls_43.c
diff -r1.33 -r1.33.12.1 src/sys/compat/freebsd/freebsd_misc.c
diff -r1.22 -r1.22.20.1 src/sys/compat/freebsd/freebsd_sched.c
diff -r1.50 -r1.50.12.1 src/sys/compat/linux/arch/alpha/linux_machdep.c
diff -r1.51.6.3 -r1.51.6.4 src/sys/compat/linux/arch/amd64/linux_machdep.c
diff -r1.32 -r1.32.12.1 src/sys/compat/linux/arch/arm/linux_machdep.c
diff -r1.19.10.1 -r1.19.10.2 src/sys/compat/linux/arch/arm/linux_ptrace.c
diff -r1.163 -r1.163.6.1 src/sys/compat/linux/arch/i386/linux_machdep.c
diff -r1.31.10.1 -r1.31.10.2 src/sys/compat/linux/arch/i386/linux_ptrace.c
diff -r1.42 -r1.42.52.1 src/sys/compat/linux/arch/m68k/linux_machdep.c
diff -r1.43 -r1.43.12.1 src/sys/compat/linux/arch/mips/linux_machdep.c
diff -r1.24 -r1.24.32.1 src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c
diff -r1.50 -r1.50.2.1 src/sys/compat/linux/arch/powerpc/linux_machdep.c
diff -r1.29.10.1 -r1.29.10.2 src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -r1.27 -r1.27.80.1 src/sys/compat/linux/common/linux_cdrom.c
diff -r1.13 -r1.13.84.1 src/sys/compat/linux/common/linux_fdio.c
diff -r1.115 -r1.115.10.1 src/sys/compat/linux/common/linux_file.c
diff -r1.17 -r1.17.10.1 src/sys/compat/linux/common/linux_hdio.c
diff -r1.238.2.2 -r1.238.2.3 src/sys/compat/linux/common/linux_misc.c
diff -r1.7 -r1.7.84.1 src/sys/compat/linux/common/linux_mtio.c
diff -r1.66 -r1.66.80.1 src/sys/compat/linux/common/linux_oldolduname.c
diff -r1.66 -r1.66.80.1 src/sys/compat/linux/common/linux_olduname.c
diff -r1.69 -r1.69.4.1 src/sys/compat/linux/common/linux_sched.c
diff -r1.79.6.1 -r1.79.6.2 src/sys/compat/linux/common/linux_signal.c
diff -r1.138.6.6 -r1.138.6.7 src/sys/compat/linux/common/linux_socket.c
diff -r1.37.22.1 -r1.37.22.2 src/sys/compat/linux/common/linux_time.c
diff -r1.38.6.2 -r1.38.6.3 src/sys/compat/linux32/arch/amd64/linux32_machdep.c
diff -r1.19 -r1.19.8.1 src/sys/compat/linux32/common/linux32_exec_elf32.c
diff -r1.11 -r1.11.30.1 src/sys/compat/linux32/common/linux32_resource.c
diff -r1.18.10.1 -r1.18.10.2 src/sys/compat/linux32/common/linux32_signal.c
diff -r1.37 -r1.37.30.1 src/sys/compat/linux32/common/linux32_time.c
diff -r1.33 -r1.33.30.1 src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -r1.36.4.1 -r1.36.4.2 src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -r1.54.8.1 -r1.54.8.2 src/sys/compat/netbsd32/netbsd32_compat_43.c
diff -r1.32.10.1 -r1.32.10.2 src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -r1.31.8.4 -r1.31.8.5 src/sys/compat/netbsd32/netbsd32_conv.h
diff -r1.5 -r1.5.8.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c
diff -r1.4.6.1 -r1.4.6.2 src/sys/compat/netbsd32/netbsd32_ptrace.c
diff -r1.43.8.1 -r1.43.8.2 src/sys/compat/netbsd32/netbsd32_signal.c
diff -r1.49 -r1.49.6.1 src/sys/compat/netbsd32/netbsd32_time.c
diff -r1.23 -r1.23.8.1 src/sys/compat/netbsd32/netbsd32_wait.c
diff -r1.70.6.3 -r1.70.6.4 src/sys/compat/ossaudio/ossaudio.c
diff -r1.68 -r1.68.8.1 src/sys/compat/sunos/sunos_ioctl.c
diff -r1.170.10.1 -r1.170.10.2 src/sys/compat/sunos/sunos_misc.c
diff -r1.34 -r1.34.10.1 src/sys/compat/sunos32/sunos32_ioctl.c
diff -r1.77.10.1 -r1.77.10.2 src/sys/compat/sunos32/sunos32_misc.c
diff -r1.1.58.1 -r1.1.58.2 src/sys/compat/sys/time_types.h
diff -r1.37 -r1.37.8.1 src/sys/compat/ultrix/ultrix_ioctl.c
diff -r1.122 -r1.122.32.1 src/sys/compat/ultrix/ultrix_misc.c

--- src/sys/compat/common/kern_info_09.c 2007/12/20 23:02:44	1.20
+++ src/sys/compat/common/kern_info_09.c 2023/06/21 21:04:01	1.20.90.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_info_09.c,v 1.20 2007/12/20 23:02:44 dsl Exp $	*/
+/*	$NetBSD: kern_info_09.c,v 1.20.90.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_info_09.c,v 1.20 2007/12/20 23:02:44 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_info_09.c,v 1.20.90.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/unistd.h>
 #include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 @@ -90,26 +90,27 @@ struct outsname {
 };
 /* ARGSUSED */
 int
 compat_09_sys_uname(struct lwp *l, const struct compat_09_sys_uname_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct outsname *) name;
 	} */
 	struct outsname outsname;
 	const char *cp;
 	char *dp, *ep;
 	memset(&outsname, 0, sizeof(outsname));
 	strncpy(outsname.sysname, ostype, sizeof(outsname.sysname));
 	strncpy(outsname.nodename, hostname, sizeof(outsname.nodename));
 	strncpy(outsname.release, osrelease, sizeof(outsname.release));
 	dp = outsname.version;
 	ep = &outsname.version[sizeof(outsname.version) - 1];
 	for (cp = version; *cp && *cp != '('; cp++)
+		;
 	for (cp++; *cp && *cp != ')' && dp < ep; cp++)
 		*dp++ = *cp;
 	for (; *cp && *cp != '#'; cp++)
+		;
 	for (; *cp && *cp != ':' && dp < ep; cp++)
 		*dp++ = *cp;

--- src/sys/compat/common/kern_info_43.c 2014/03/24 20:08:08	1.35
+++ src/sys/compat/common/kern_info_43.c 2023/06/21 21:04:01	1.35.22.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_info_43.c,v 1.35 2014/03/24 20:08:08 christos Exp $	*/
+/*	$NetBSD: kern_info_43.c,v 1.35.22.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_info_43.c,v 1.35 2014/03/24 20:08:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_info_43.c,v 1.35.22.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 @@ -223,26 +223,28 @@ compat_43_sys_getkerninfo(struct lwp *l,
 			struct timeval tv;
 			const char *cpu_model = cpu_getmodel();
 			char *us = (char *) &usi[1];
 			if (usi == NULL) {
 				size = sizeof(ksi) +
 				    strlen(ostype) + strlen(cpu_model) +
 				    strlen(osrelease) + strlen(machine) +
 				    strlen(version) + strlen(hostname) + 6;
 				error = 0;
 				break;
+			}
 			memset(&ksi, 0, sizeof(ksi));
 #define COPY(fld)							\
 			ksi.fld = us - (u_long) usi;			\
 			if ((error = copyoutstr(fld, us, 1024, &len)) != 0)\
 				return error;				\
 			us += len
 			COPY(machine);
 			COPY(cpu_model);
 			ksi.ncpu = ncpu;		/* XXX */
 			ksi.cpuspeed = 40;		/* XXX */
 			ksi.hwflags = 0;		/* XXX */
 			ksi.physmem = ctob(physmem);
 			ksi.usermem = ctob(physmem);	/* XXX */

--- src/sys/compat/common/kern_resource_43.c 2007/12/20 23:02:44	1.21
+++ src/sys/compat/common/kern_resource_43.c 2023/06/21 21:04:01	1.21.90.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_resource_43.c,v 1.21 2007/12/20 23:02:44 dsl Exp $	*/
+/*	$NetBSD: kern_resource_43.c,v 1.21.90.1 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,52 +27,53 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_resource_43.c,v 1.21 2007/12/20 23:02:44 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource_43.c,v 1.21.90.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/resourcevar.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 /* ARGSUSED */
 int
 compat_43_sys_getrlimit(struct lwp *l, const struct compat_43_sys_getrlimit_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(struct orlimit *) rlp;
 	} */
 	struct proc *p = l->l_proc;
 	int which = SCARG(uap, which);
 	struct orlimit olim;
 	if ((u_int)which >= RLIM_NLIMITS)
 		return (EINVAL);
 	memset(&olim, 0, sizeof(olim));
 	olim.rlim_cur = p->p_rlimit[which].rlim_cur;
 	if (olim.rlim_cur == -1)
 		olim.rlim_cur = 0x7fffffff;
 	olim.rlim_max = p->p_rlimit[which].rlim_max;
 	if (olim.rlim_max == -1)
 		olim.rlim_max = 0x7fffffff;
 	return copyout(&olim, SCARG(uap, rlp), sizeof(olim));
+}
 /* ARGSUSED */
 int
 compat_43_sys_setrlimit(struct lwp *l, const struct compat_43_sys_setrlimit_args *uap, register_t *retval)
+{

--- src/sys/compat/common/kern_sig_13.c 2011/01/19 10:21:16	1.20
+++ src/sys/compat/common/kern_sig_13.c 2023/06/21 21:04:01	1.20.50.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sig_13.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $	*/
+/*	$NetBSD: kern_sig_13.c,v 1.20.50.1 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,73 +20,76 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.20.50.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <machine/limits.h>
 #include <compat/sys/signal.h>
 #include <compat/sys/signalvar.h>
 #include <compat/common/compat_util.h>
 #include <compat/common/compat_sigaltstack.h>
 void
 native_sigset13_to_sigset(const sigset13_t *oss, sigset_t *ss)
+{
 	memset(ss, 0, sizeof(*ss));
 	ss->__bits[0] = *oss;
 	ss->__bits[1] = 0;
 	ss->__bits[2] = 0;
 	ss->__bits[3] = 0;
+}
 void
 native_sigset_to_sigset13(const sigset_t *ss, sigset13_t *oss)
+{
 	*oss = ss->__bits[0];
+}
 void
 native_sigaction13_to_sigaction(const struct sigaction13 *osa, struct sigaction *sa)
+{
 	memset(sa, 0, sizeof(*sa));
 	sa->sa_handler = osa->osa_handler;
 	native_sigset13_to_sigset(&osa->osa_mask, &sa->sa_mask);
 	sa->sa_flags = osa->osa_flags;
+}
 void
 native_sigaction_to_sigaction13(const struct sigaction *sa, struct sigaction13 *osa)
+{
 	memset(osa, 0, sizeof(*osa));
 	osa->osa_handler = sa->sa_handler;
 	native_sigset_to_sigset13(&sa->sa_mask, &osa->osa_mask);
 	osa->osa_flags = sa->sa_flags;
+}
 int
 compat_13_sys_sigaltstack(struct lwp *l, const struct compat_13_sys_sigaltstack_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const struct sigaltstack13 *) nss;
 		syscallarg(struct sigaltstack13 *) oss;
 	} */
 	compat_sigaltstack(uap, sigaltstack13, SS_ONSTACK, SS_DISABLE);

--- src/sys/compat/common/kern_sig_43.c 2020/01/21 18:12:53	1.34.50.1
+++ src/sys/compat/common/kern_sig_43.c 2023/06/21 21:04:01	1.34.50.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sig_43.c,v 1.34.50.1 2020/01/21 18:12:53 martin Exp $	*/
+/*	$NetBSD: kern_sig_43.c,v 1.34.50.2 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.34.50.1 2020/01/21 18:12:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.34.50.2 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/timeb.h>
 @@ -63,58 +63,64 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig_43.
 #include <compat/sys/signal.h>
 void compat_43_sigmask_to_sigset(const int *, sigset_t *);
 void compat_43_sigset_to_sigmask(const sigset_t *, int *);
 void compat_43_sigvec_to_sigaction(const struct sigvec *, struct sigaction *);
 void compat_43_sigaction_to_sigvec(const struct sigaction *, struct sigvec *);
 void compat_43_sigstack_to_sigaltstack(const struct sigstack *, struct sigaltstack *);
 void compat_43_sigaltstack_to_sigstack(const struct sigaltstack *, struct sigstack *);
 void
 compat_43_sigmask_to_sigset(const int *sm, sigset_t *ss)
+{
 	memset(ss, 0, sizeof(*ss));
 	ss->__bits[0] = *sm;
 	ss->__bits[1] = 0;
 	ss->__bits[2] = 0;
 	ss->__bits[3] = 0;
+}
 void
 compat_43_sigset_to_sigmask(const sigset_t *ss, int *sm)
+{
 	*sm = ss->__bits[0];
+}
 void
 compat_43_sigvec_to_sigaction(const struct sigvec *sv, struct sigaction *sa)
+{
 	memset(sa, 0, sizeof(*sa));
 	sa->sa_handler = sv->sv_handler;
 	compat_43_sigmask_to_sigset(&sv->sv_mask, &sa->sa_mask);
 	sa->sa_flags = sv->sv_flags ^ SA_RESTART;
+}
 void
 compat_43_sigaction_to_sigvec(const struct sigaction *sa, struct sigvec *sv)
+{
 	memset(sv, 0, sizeof(*sv));
 	sv->sv_handler = sa->sa_handler;
 	compat_43_sigset_to_sigmask(&sa->sa_mask, &sv->sv_mask);
 	sv->sv_flags = sa->sa_flags ^ SA_RESTART;
+}
 void
 compat_43_sigstack_to_sigaltstack(const struct sigstack *ss, struct sigaltstack *sa)
+{
 	memset(sa, 0, sizeof(*sa));
 	sa->ss_sp = ss->ss_sp;
 	sa->ss_size = SIGSTKSZ;	/* Use the recommended size */
 	sa->ss_flags = 0;
 	if (ss->ss_onstack)
 		sa->ss_flags |= SS_ONSTACK;
+}
 void
 compat_43_sigaltstack_to_sigstack(const struct sigaltstack *sa, struct sigstack *ss)
+{
 	memset(ss, 0, sizeof(*ss));
 	ss->ss_sp = sa->ss_sp;
 	if (sa->ss_flags & SS_ONSTACK)

--- src/sys/compat/common/kern_time_50.c 2016/03/11 18:32:29	1.31
+++ src/sys/compat/common/kern_time_50.c 2023/06/21 21:04:01	1.31.10.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_time_50.c,v 1.31 2016/03/11 18:32:29 christos Exp $	*/
+/*	$NetBSD: kern_time_50.c,v 1.31.10.1 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.31 2016/03/11 18:32:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.31.10.1 2023/06/21 21:04:01 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_aio.h"
 #include "opt_ntp.h"
 #include "opt_mqueue.h"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 @@ -181,26 +181,27 @@ compat_50_sys_gettimeofday(struct lwp *l
 	if (SCARG(uap, tp)) {
 		microtime(&atv);
 		timeval_to_timeval50(&atv, &atv50);
 		error = copyout(&atv50, SCARG(uap, tp), sizeof(*SCARG(uap, tp)));
 		if (error)
 			return error;
+	}
 	if (SCARG(uap, tzp)) {
 		/*
 		 * NetBSD has no kernel notion of time zone, so we just
 		 * fake up a timezone struct and return it if demanded.
 		 */
 		memset(&tzfake, 0, sizeof(tzfake));
 		tzfake.tz_minuteswest = 0;
 		tzfake.tz_dsttime = 0;
 		error = copyout(&tzfake, SCARG(uap, tzp), sizeof(tzfake));
+	}
 	return error;
+}
 /* ARGSUSED */
 int
 compat_50_sys_settimeofday(struct lwp *l,
     const struct compat_50_sys_settimeofday_args *uap, register_t *retval)
+{
 	/* {
 @@ -415,26 +416,27 @@ compat_50_sys_mq_timedreceive(struct lwp
 	    SCARG(uap, msg_len), SCARG(uap, msg_prio), tsp, &mlen);
 	if (error == 0)
 		*retval = mlen;
 	return error;
 #else
 	return ENOSYS;
 #endif
+}
 void
 rusage_to_rusage50(const struct rusage *ru, struct rusage50 *ru50)
+{
 	memset(ru50, 0, sizeof(*ru50));
 	(void)memcpy(&ru50->ru_first, &ru->ru_first,
 	    (char *)&ru50->ru_last - (char *)&ru50->ru_first +
 	    sizeof(ru50->ru_last));
 	ru50->ru_maxrss = ru->ru_maxrss;
 	timeval_to_timeval50(&ru->ru_utime, &ru50->ru_utime);
 	timeval_to_timeval50(&ru->ru_stime, &ru50->ru_stime);
+}
 int
 compat_50_sys_getrusage(struct lwp *l,
     const struct compat_50_sys_getrusage_args *uap, register_t *retval)
+{
 	/* {

--- src/sys/compat/common/vfs_syscalls_12.c 2017/12/10 09:36:36	1.33.8.2
+++ src/sys/compat/common/vfs_syscalls_12.c 2023/06/21 21:04:01	1.33.8.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls_12.c,v 1.33.8.2 2017/12/10 09:36:36 snj Exp $	*/
+/*	$NetBSD: vfs_syscalls_12.c,v 1.33.8.3 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	From: @(#)vfs_syscalls.c	8.28 (Berkeley) 12/10/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.33.8.2 2017/12/10 09:36:36 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.33.8.3 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/socketvar.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/dirent.h>
 @@ -55,26 +55,27 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls
 #include <sys/syscallargs.h>
 #include <compat/sys/stat.h>
 #include <compat/sys/dirent.h>
 /*
  * Convert from a new to an old stat structure.
  */
 void
 compat_12_stat_conv(const struct stat *st, struct stat12 *ost)
+{
 	memset(ost, 0, sizeof(*ost));
 	ost->st_dev = st->st_dev;
 	ost->st_ino = st->st_ino;
 	ost->st_mode = st->st_mode & 0xffff;
 	if (st->st_nlink >= (1 << 15))
 		ost->st_nlink = (1 << 15) - 1;
 	else
 		ost->st_nlink = st->st_nlink;
 	ost->st_uid = st->st_uid;
 	ost->st_gid = st->st_gid;
 	ost->st_rdev = st->st_rdev;
 	timespec_to_timespec50(&st->st_atimespec, &ost->st_atimespec);
 	timespec_to_timespec50(&st->st_mtimespec, &ost->st_mtimespec);
 	timespec_to_timespec50(&st->st_ctimespec, &ost->st_ctimespec);
 @@ -173,26 +174,27 @@ again:
 		reclen = bdp->d_reclen;
 		if (reclen & 3) {
 			error = EIO;
 			goto out;
+		}
 		if (bdp->d_fileno == 0) {
 			inp += reclen;	/* it is a hole; squish it out */
 			if (cookie)
 				off = *cookie++;
 			else
 				off += reclen;
 			continue;
+		}
 		memset(&idb, 0, sizeof(idb));
 		if (bdp->d_namlen >= sizeof(idb.d_name))
 			idb.d_namlen = sizeof(idb.d_name) - 1;
 		else
 			idb.d_namlen = bdp->d_namlen;
 		old_reclen = _DIRENT_RECLEN(&idb, bdp->d_namlen);
 		if (reclen > len || resid < old_reclen) {
 			/* entry too big for buffer, so just stop */
 			outp++;
 			break;
+		}
 		/*
 		 * Massage in place to make a Dirent12-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of

--- src/sys/compat/common/vfs_syscalls_30.c 2021/08/15 10:03:46	1.36.12.1
+++ src/sys/compat/common/vfs_syscalls_30.c 2023/06/21 21:04:01	1.36.12.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls_30.c,v 1.36.12.1 2021/08/15 10:03:46 martin Exp $	*/
+/*	$NetBSD: vfs_syscalls_30.c,v 1.36.12.2 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.36.12.1 2021/08/15 10:03:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.36.12.2 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/socketvar.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 @@ -242,26 +242,27 @@ again:
 		bdp = (struct dirent *)inp;
 		reclen = bdp->d_reclen;
 		if (reclen & _DIRENT_ALIGN(bdp))
 			panic("%s: bad reclen %d", __func__, reclen);
 		if (cookie)
 			off = *cookie++; /* each entry points to the next */
 		else
 			off += reclen;
 		if ((off >> 32) != 0) {
 			compat_offseterr(vp, "netbsd30_getdents");
 			error = EINVAL;
 			goto out;
+		}
 		memset(&idb, 0, sizeof(idb));
 		if (bdp->d_namlen >= sizeof(idb.d_name))
 			idb.d_namlen = sizeof(idb.d_name) - 1;
 		else
 			idb.d_namlen = bdp->d_namlen;
 		idb.d_reclen = _DIRENT_SIZE(&idb);
 		if (reclen > len || resid < idb.d_reclen) {
 			/* entry too big for buffer, so just stop */
 			outp++;
 			break;
+		}
 		/*
 		 * Massage in place to make a NetBSD-3.0-shaped dirent
 		 * (otherwise we have to worry about touching user memory
 @@ -331,26 +332,27 @@ compat_30_sys_getfh(struct lwp *l, const
 	if (error) {
 		return error;
+	}
 	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | TRYEMULROOT, pb);
 	error = namei(&nd);
 	pathbuf_destroy(pb);
 	if (error)
 		return error;
 	vp = nd.ni_vp;
 	sz = sizeof(struct compat_30_fhandle);
 	error = vfs_composefh(vp, (void *)&fh, &sz);
 	vput(vp);
 	CTASSERT(FHANDLE_SIZE_COMPAT == sizeof(struct compat_30_fhandle));
 	if (sz != FHANDLE_SIZE_COMPAT) {
 		error = EINVAL;
+	}
 	if (error)
 		return error;
 	return copyout(&fh, SCARG(uap, fhp), sizeof(fh));
+}
 /*
  * Open a file given a file handle.
+ *
  * Check permissions, allocate an open file structure,
  * and call the device open routine if any.

--- src/sys/compat/common/vfs_syscalls_43.c 2021/08/15 10:03:46	1.59.8.3
+++ src/sys/compat/common/vfs_syscalls_43.c 2023/06/21 21:04:01	1.59.8.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls_43.c,v 1.59.8.3 2021/08/15 10:03:46 martin Exp $	*/
+/*	$NetBSD: vfs_syscalls_43.c,v 1.59.8.4 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_syscalls.c	8.28 (Berkeley) 12/10/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.59.8.3 2021/08/15 10:03:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.59.8.4 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 @@ -446,26 +446,27 @@ again:
 		reclen = bdp->d_reclen;
 		if (reclen & 3) {
 			error = EIO;
 			goto out;
+		}
 		if (bdp->d_fileno == 0) {
 			inp += reclen;	/* it is a hole; squish it out */
 			if (cookie)
 				off = *cookie++;
 			else
 				off += reclen;
 			continue;
+		}
 		memset(&idb, 0, sizeof(idb));
 		if (bdp->d_namlen >= sizeof(idb.d_name))
 			idb.d_namlen = sizeof(idb.d_name) - 1;
 		else
 			idb.d_namlen = bdp->d_namlen;
 		old_reclen = _DIRENT_RECLEN(&idb, bdp->d_namlen);
 		if (reclen > len || resid < old_reclen) {
 			/* entry too big for buffer, so just stop */
 			outp++;
 			break;
+		}
 		/*
 		 * Massage in place to make a Dirent12-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of

--- src/sys/compat/freebsd/freebsd_misc.c 2014/11/09 18:30:38	1.33
+++ src/sys/compat/freebsd/freebsd_misc.c 2023/06/21 21:04:02	1.33.12.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: freebsd_misc.c,v 1.33 2014/11/09 18:30:38 maxv Exp $	*/
+/*	$NetBSD: freebsd_misc.c,v 1.33.12.1 2023/06/21 21:04:02 martin Exp $	*/
 /*
  * Copyright (c) 1995 Frank van der Linden
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * FreeBSD compatibility module. Try to deal with various FreeBSD system calls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.33 2014/11/09 18:30:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.33.12.1 2023/06/21 21:04:02 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/mman.h>
 #include <sys/ktrace.h>
 @@ -173,26 +173,27 @@ freebsd_sys_sigaction4(struct lwp *l, co
 		error = copyin(SCARG(uap, nsa), &nesa, sizeof(nesa));
 		if (error)
 			return (error);
 		nbsa.sa_handler = nesa.freebsd_sa_handler;
 		nbsa.sa_mask    = nesa.freebsd_sa_mask;
 		nbsa.sa_flags   = nesa.freebsd_sa_flags;
+	}
 	error = sigaction1(l, SCARG(uap, signum),
 	    SCARG(uap, nsa) ? &nbsa : 0, SCARG(uap, osa) ? &obsa : 0,
 	    NULL, 0);
 	if (error)
 		return (error);
 	if (SCARG(uap, osa)) {
 		memset(&oesa, 0, sizeof(oesa));
 		oesa.freebsd_sa_handler = obsa.sa_handler;
 		oesa.freebsd_sa_mask    = obsa.sa_mask;
 		oesa.freebsd_sa_flags   = obsa.sa_flags;
 		error = copyout(&oesa, SCARG(uap, osa), sizeof(oesa));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 int
 freebsd_sys_utrace(struct lwp *l, const struct freebsd_sys_utrace_args *uap, register_t *retval)
+{

--- src/sys/compat/freebsd/freebsd_sched.c 2014/06/28 11:06:31	1.22
+++ src/sys/compat/freebsd/freebsd_sched.c 2023/06/21 21:04:02	1.22.20.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: freebsd_sched.c,v 1.22 2014/06/28 11:06:31 maxv Exp $	*/
+/*	$NetBSD: freebsd_sched.c,v 1.22.20.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * FreeBSD compatibility module. Try to deal with scheduler related syscalls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sched.c,v 1.22 2014/06/28 11:06:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sched.c,v 1.22.20.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 #include <sys/cpu.h>
 #include <compat/freebsd/freebsd_syscallargs.h>
 #include <compat/freebsd/freebsd_sched.h>
 @@ -112,26 +112,27 @@ sched_native2freebsd(int native_policy,
 	case SCHED_RR:
 		p = FREEBSD_SCHED_RR;
 		break;
 	default:
 		return EINVAL;
+	}
 	if (freebsd_policy != NULL)
 		*freebsd_policy = p;
 	if (native_params != NULL && freebsd_params != NULL) {
 		/* XXX: Needs adjustment to do a proper conversion. */
 		memset(freebsd_params, 0, sizeof(*freebsd_params));
 		freebsd_params->sched_priority = native_params->sched_priority;
+	}
 	return 0;
+}
 int
 freebsd_sys_sched_setparam(struct lwp *l, const struct freebsd_sys_sched_setparam_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(pid_t) pid;
 		syscallarg(const struct freebsd_sched_param *) sp;
 	} */

--- src/sys/compat/linux/arch/alpha/linux_machdep.c 2014/11/09 17:48:07	1.50
+++ src/sys/compat/linux/arch/alpha/linux_machdep.c 2023/06/21 21:04:03	1.50.12.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.50.12.1 2023/06/21 21:04:03 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
  * Based on sys/arch/i386/i386/linux_machdep.c:
  *	linux_machdep.c,v 1.42 1998/09/11 12:50:06 mycroft Exp
  *	written by Frank van der Linden
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50.12.1 2023/06/21 21:04:03 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -129,26 +129,28 @@ setup_linux_rt_sigframe(struct trapframe
 	if (onstack)
 		sfp = (struct linux_rt_sigframe *)
 		    ((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
 	else
 		sfp = (struct linux_rt_sigframe *)(alpha_pal_rdusp());
 	sfp = (struct linux_rt_sigframe *)((char *)sfp - rndfsize);
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid))
 		printf("linux_sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid,
 		    sig, &onstack, sfp);
 #endif /* DEBUG */
 	memset(&sigframe, 0, sizeof(sigframe));
 	/*
 	 * Build the signal context to be used by sigreturn.
 	 */
 	memset(&sigframe.uc, 0, sizeof(struct linux_ucontext));
 	sigframe.uc.uc_mcontext.sc_onstack = onstack;
 	/* Setup potentially partial signal mask in sc_mask. */
 	/* But get all of it in uc_sigmask */
 	native_to_linux_old_sigset(&sigframe.uc.uc_mcontext.sc_mask, mask);
 	native_to_linux_sigset(&sigframe.uc.uc_sigmask, mask);
 	sigframe.uc.uc_mcontext.sc_pc = tf->tf_regs[FRAME_PC];
 	sigframe.uc.uc_mcontext.sc_ps = ALPHA_PSL_USERMODE;
 @@ -222,26 +224,28 @@ void setup_linux_sigframe(struct trapfra
 	if (onstack)
 		sfp = (struct linux_sigframe *)
 		    ((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
 	else
 		sfp = (struct linux_sigframe *)(alpha_pal_rdusp());
 	sfp = (struct linux_sigframe *)((char *)sfp - rndfsize);
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid))
 		printf("linux_sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid,
 		    sig, &onstack, sfp);
 #endif /* DEBUG */
 	memset(&sigframe, 0, sizeof(sigframe));
 	/*
 	 * Build the signal context to be used by sigreturn.
 	 */
 	memset(&sigframe.sf_sc, 0, sizeof(struct linux_sigcontext));
 	sigframe.sf_sc.sc_onstack = onstack;
 	native_to_linux_old_sigset(&sigframe.sf_sc.sc_mask, mask);
 	sigframe.sf_sc.sc_pc = tf->tf_regs[FRAME_PC];
 	sigframe.sf_sc.sc_ps = ALPHA_PSL_USERMODE;
 	frametoreg(tf, (struct reg *)sigframe.sf_sc.sc_regs);
 	sigframe.sf_sc.sc_regs[R_SP] = alpha_pal_rdusp();
 	if (l == fpcurlwp) {
 		struct pcb *pcb = lwp_getpcb(l);

--- src/sys/compat/linux/arch/amd64/linux_machdep.c 2020/01/21 18:12:54	1.51.6.3
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c 2023/06/21 21:04:03	1.51.6.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.51.6.3 2020/01/21 18:12:54 martin Exp $ */
+/*	$NetBSD: linux_machdep.c,v 1.51.6.4 2023/06/21 21:04:03 martin Exp $ */
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,27 +23,27 @@
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51.6.3 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51.6.4 2023/06/21 21:04:03 martin Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h> /* for process_read_fpregs() */
 #include <sys/ucontext.h>
 #include <sys/conf.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 @@ -215,26 +215,27 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	sigframe.uc.luc_mcontext.fpstate = fpsp;
 	native_to_linux_sigset(&sigframe.uc.luc_sigmask, mask);
 	native_to_linux_siginfo(&sigframe.info, &ksi->ksi_info);
 	sendsig_reset(l, sig);
 	mutex_exit(p->p_lock);
 	error = 0;
 	/*
 	 * Save FPU state, if any
 	 */
 	if (fpsp != NULL) {
 		size_t fp_size = sizeof fpregs;
 		/* The netbsd and linux structures both match the fxsave data */
 		memset(&fpregs, 0, sizeof(fpregs));
 		(void)process_read_fpregs(l, &fpregs, &fp_size);
 		error = copyout(&fpregs, fpsp, sizeof(*fpsp));
+	}
 	if (error == 0)
 		error = copyout(&sigframe, sp, sizeof(sigframe));
 	mutex_enter(p->p_lock);
 	if (error != 0) {
 		sigexit(l, SIGILL);
 		return;
+	}

--- src/sys/compat/linux/arch/arm/linux_machdep.c 2014/11/09 17:48:07	1.32
+++ src/sys/compat/linux/arch/arm/linux_machdep.c 2023/06/21 21:04:02	1.32.12.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.32 2014/11/09 17:48:07 maxv Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.32.12.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.32 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.32.12.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -97,26 +97,28 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	    (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0 &&
 	    (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0;
 	/* Allocate space for the signal handler context. */
 	if (onstack)
 		fp = (struct linux_sigframe *)((char *)l->l_sigstk.ss_sp +
 					  l->l_sigstk.ss_size);
 	else
 		fp = (struct linux_sigframe *)tf->tf_usr_sp;
 	fp--;
 	/* Build stack frame for signal trampoline. */
 	memset(&frame, 0, sizeof(frame));
 	/* Save register context. */
 	frame.sf_sc.sc_r0     = tf->tf_r0;
 	frame.sf_sc.sc_r1     = tf->tf_r1;
 	frame.sf_sc.sc_r2     = tf->tf_r2;
 	frame.sf_sc.sc_r3     = tf->tf_r3;
 	frame.sf_sc.sc_r4     = tf->tf_r4;
 	frame.sf_sc.sc_r5     = tf->tf_r5;
 	frame.sf_sc.sc_r6     = tf->tf_r6;
 	frame.sf_sc.sc_r7     = tf->tf_r7;
 	frame.sf_sc.sc_r8     = tf->tf_r8;
 	frame.sf_sc.sc_r9     = tf->tf_r9;
 	frame.sf_sc.sc_r10    = tf->tf_r10;
 	frame.sf_sc.sc_r11    = tf->tf_r11;

--- src/sys/compat/linux/arch/arm/linux_ptrace.c 2018/04/12 13:42:49	1.19.10.1
+++ src/sys/compat/linux/arch/arm/linux_ptrace.c 2023/06/21 21:04:02	1.19.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.19.10.1 2018/04/12 13:42:49 martin Exp $	*/
+/*	$NetBSD: linux_ptrace.c,v 1.19.10.2 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.19.10.1 2018/04/12 13:42:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.19.10.2 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <compat/linux/common/linux_types.h>
 @@ -170,26 +170,27 @@ linux_sys_ptrace_arch(struct lwp *l, con
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);
 		if (error) {
 			break;
+		}
 		memset(linux_regs, 0, sizeof(*linux_regs));
 		memcpy(linux_regs->uregs, regs->r, 13 * sizeof(register_t));
 		linux_regs->uregs[LINUX_REG_SP] = regs->r_sp;
 		linux_regs->uregs[LINUX_REG_LR] = regs->r_lr;
 		linux_regs->uregs[LINUX_REG_PC] = regs->r_pc;
 		linux_regs->uregs[LINUX_REG_CPSR] = regs->r_cpsr;
 		linux_regs->uregs[LINUX_REG_ORIG_R0] = regs->r[0];
 		error = copyout(linux_regs, (void *)SCARG(uap, data),
 		    sizeof(struct linux_reg));
 		break;
 	case LINUX_PTRACE_SETREGS:
 		memcpy(regs->r, linux_regs->uregs, 13 * sizeof(register_t));

--- src/sys/compat/linux/arch/i386/linux_machdep.c 2017/02/05 10:42:22	1.163
+++ src/sys/compat/linux/arch/i386/linux_machdep.c 2023/06/21 21:04:01	1.163.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.163 2017/02/05 10:42:22 maxv Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.163.6.1 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.163 2017/02/05 10:42:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.163.6.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #include "opt_user_ldt.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 @@ -254,26 +254,28 @@ linux_rt_sendsig(const ksiginfo_t *ksi,
 	/* Allocate space for the signal handler context. */
 	if (onstack)
 		fp = (struct linux_rt_sigframe *)((char *)sas->ss_sp +
 		    sas->ss_size);
 	else
 		fp = (struct linux_rt_sigframe *)tf->tf_esp;
 	fp--;
 	DPRINTF(("rt: onstack = %d, fp = %p sig = %d eip = 0x%x cr2 = 0x%x\n",
 	    onstack, fp, sig, tf->tf_eip,
 	    ((struct pcb *)lwp_getpcb(l))->pcb_cr2));
 	memset(&frame, 0, sizeof(frame));
 	/* Build stack frame for signal trampoline. */
 	frame.sf_handler = catcher;
 	frame.sf_sig = native_to_linux_signo[sig];
 	frame.sf_sip = &fp->sf_si;
 	frame.sf_ucp = &fp->sf_uc;
 	/*
 	 * XXX: the following code assumes that the constants for
 	 * siginfo are the same between linux and NetBSD.
 	 */
 	native_to_linux_siginfo(&frame.sf_si, &ksi->ksi_info);
 	/* Save register context. */
 @@ -331,26 +333,28 @@ linux_old_sendsig(const ksiginfo_t *ksi,
 	/* Allocate space for the signal handler context. */
 	if (onstack)
 		fp = (struct linux_sigframe *) ((char *)sas->ss_sp +
 		    sas->ss_size);
 	else
 		fp = (struct linux_sigframe *)tf->tf_esp;
 	fp--;
 	DPRINTF(("old: onstack = %d, fp = %p sig = %d eip = 0x%x cr2 = 0x%x\n",
 	    onstack, fp, sig, tf->tf_eip,
 	    ((struct pcb *)lwp_getpcb(l))->pcb_cr2));
 	memset(&frame, 0, sizeof(frame));
 	/* Build stack frame for signal trampoline. */
 	frame.sf_handler = catcher;
 	frame.sf_sig = native_to_linux_signo[sig];
 	linux_save_sigcontext(l, tf, mask, &frame.sf_sc);
 	sendsig_reset(l, sig);
 	mutex_exit(p->p_lock);
 	error = copyout(&frame, fp, sizeof(frame));
 	mutex_enter(p->p_lock);
 	if (error != 0) {
 		/*
 @@ -856,26 +860,27 @@ linux_machdepioctl(struct lwp *l, const
 	case LINUX_KDDISABIO:
 		com = KDDISABIO;
 		break;
 	case LINUX_KDGETLED:
 		com = KDGETLED;
 		break;
 	case LINUX_KDSETLED:
 		com = KDSETLED;
 		break;
 	case LINUX_VT_OPENQRY:
 		com = VT_OPENQRY;
 		break;
 	case LINUX_VT_GETMODE:
 		memset(&lvt, 0, sizeof(lvt));
 		error = fp->f_ops->fo_ioctl(fp, VT_GETMODE, &lvt);
 		if (error != 0)
 			goto out;
 		lvt.relsig = native_to_linux_signo[lvt.relsig];
 		lvt.acqsig = native_to_linux_signo[lvt.acqsig];
 		lvt.frsig = native_to_linux_signo[lvt.frsig];
 		error = copyout(&lvt, SCARG(uap, data), sizeof (lvt));
 		goto out;
 	case LINUX_VT_SETMODE:
 		error = copyin(SCARG(uap, data), &lvt, sizeof (lvt));
 		if (error != 0)
 			goto out;
 		lvt.relsig = linux_to_native_signo[lvt.relsig];
 @@ -951,33 +956,35 @@ linux_machdepioctl(struct lwp *l, const
 			sectors = bip->bi_sec;
 			cylinders = bip->bi_cyl;
 			biostotal = heads * sectors * cylinders;
 			realtotal = label.d_ntracks * label.d_nsectors *
 			    label.d_ncylinders;
 			if (realtotal > biostotal)
 				cylinders = realtotal / (heads * sectors);
 		} else {
 			heads = label.d_ntracks;
 			cylinders = label.d_ncylinders;
 			sectors = label.d_nsectors;
+		}
 		if (com == LINUX_HDIO_GETGEO) {
 			memset(&hdg, 0, sizeof(hdg));
 			hdg.start = start;
 			hdg.heads = heads;
 			hdg.cylinders = cylinders;
 			hdg.sectors = sectors;
 			error = copyout(&hdg, SCARG(uap, data), sizeof hdg);
 			goto out;
 		} else {
 			memset(&hdg_big, 0, sizeof(hdg_big));
 			hdg_big.start = start;
 			hdg_big.heads = heads;
 			hdg_big.cylinders = cylinders;
 			hdg_big.sectors = sectors;
 			error = copyout(&hdg_big, SCARG(uap, data),
 			    sizeof hdg_big);
 			goto out;
+		}
 	default:
 		/*
 		 * Unknown to us. If it's on a device, just pass it through
 		 * using PTIOCLINUX, the device itself might be able to

--- src/sys/compat/linux/arch/i386/linux_ptrace.c 2018/04/12 13:42:48	1.31.10.1
+++ src/sys/compat/linux/arch/i386/linux_ptrace.c 2023/06/21 21:04:01	1.31.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.31.10.1 2018/04/12 13:42:48 martin Exp $	*/
+/*	$NetBSD: linux_ptrace.c,v 1.31.10.2 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.31.10.1 2018/04/12 13:42:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.31.10.2 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <compat/linux/common/linux_types.h>
 @@ -213,26 +213,27 @@ linux_sys_ptrace_arch(struct lwp *l, con
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);
 		if (error) {
 			break;
+		}
 		memset(linux_regs, 0, sizeof(*linux_regs));
 		linux_regs->ebx = regs->r_ebx;
 		linux_regs->ecx = regs->r_ecx;
 		linux_regs->edx = regs->r_edx;
 		linux_regs->esi = regs->r_esi;
 		linux_regs->edi = regs->r_edi;
 		linux_regs->ebp = regs->r_ebp;
 		linux_regs->eax = regs->r_eax;
 		linux_regs->xds = regs->r_ds;
 		linux_regs->xes = regs->r_es;
 		linux_regs->orig_eax = regs->r_eax; /* XXX is this correct? */
 		linux_regs->eip = regs->r_cs + regs->r_eip;
 		linux_regs->xcs = regs->r_cs;
 		linux_regs->eflags = regs->r_eflags;

--- src/sys/compat/linux/arch/m68k/linux_machdep.c 2010/07/07 01:30:34	1.42
+++ src/sys/compat/linux/arch/m68k/linux_machdep.c 2023/06/21 21:04:03	1.42.52.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.42 2010/07/07 01:30:34 chs Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.42.52.1 2023/06/21 21:04:03 martin Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by ITOH Yasufumi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.42 2010/07/07 01:30:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.42.52.1 2023/06/21 21:04:03 martin Exp $");
 #define COMPAT_LINUX 1
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/syscallargs.h>
 @@ -108,26 +108,28 @@ setup_linux_sigframe(struct frame *frame
 	ft = frame->f_format;
 	/* Allocate space for the signal handler context on the user stack. */
 	fp = (struct linux_sigframe *) usp;
 	fp--;
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("setup_linux_sigframe(%d): sig %d ssp %p usp %p scp %p ft %d\n",
 		       p->p_pid, sig, &ft, fp, &fp->sf_c.c_sc, ft);
 #endif
 	memset(&kf, 0, sizeof(kf));
 	/* Build stack frame. */
 	kf.sf_psigtramp = fp->sf_sigtramp;	/* return addr for handler */
 	kf.sf_signum = native_to_linux_signo[sig];
 	kf.sf_code = frame->f_vector;		/* Does anyone use it? */
 	kf.sf_scp = &fp->sf_c.c_sc;
 	/* The sigtramp code is on the stack frame on Linux/m68k. */
 	kf.sf_sigtramp[0] = LINUX_SF_SIGTRAMP0;
 	kf.sf_sigtramp[1] = LINUX_SF_SIGTRAMP1;
 	/*
 	 * Save necessary hardware state.  Currently this includes:
 	 *	- scratch registers
 @@ -270,26 +272,28 @@ setup_linux_rt_sigframe(struct frame *fr
 	ft = frame->f_format;
 	/* Allocate space for the signal handler context on the user stack. */
 	fp = (struct linux_rt_sigframe *) usp;
 	fp--;
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("setup_linux_rt_sigframe(%d): sig %d ssp %p usp %p ucp %p ft %d\n",
 		       p->p_pid, sig, &ft, fp, &fp->sf_uc, ft);
 #endif
 	memset(&kf, 0, sizeof(kf));
 	/* Build stack frame. */
 	kf.sf_psigtramp = fp->sf_sigtramp;	/* return addr for handler */
 	kf.sf_signum = native_to_linux_signo[sig];
 	kf.sf_pinfo = &fp->sf_info;
 	kf.sf_puc = &fp->sf_uc;
 	/* The sigtramp code is on the stack frame on Linux/m68k. */
 	kf.sf_sigtramp[0] = LINUX_RT_SF_SIGTRAMP0;
 	kf.sf_sigtramp[1] = LINUX_RT_SF_SIGTRAMP1;
 	/* clear for security (and initialize uc_flags, ss_format, etc.). */
 	memset(&kf.sf_uc, 0, sizeof(struct linux_ucontext));

--- src/sys/compat/linux/arch/mips/linux_machdep.c 2014/11/09 17:48:07	1.43
+++ src/sys/compat/linux/arch/mips/linux_machdep.c 2023/06/21 21:04:02	1.43.12.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.43 2014/11/09 17:48:07 maxv Exp $ */
+/*	$NetBSD: linux_machdep.c,v 1.43.12.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.43 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.43.12.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -391,26 +391,27 @@ linux_sys_ioperm(struct lwp *l, const st
 int
 linux_sys_new_uname(struct lwp *l, const struct linux_sys_new_uname_args *uap, register_t *retval)
+{
 /*
  * Use this if you want to try Linux emulation with a glibc-2.2
  * or higher. Note that signals will not work
  */
 #if 0
         struct linux_sys_uname_args /* {
                 syscallarg(struct linux_utsname *) up;
         } */ *uap = v;
         struct linux_utsname luts;
 	memset(&luts, 0, sizeof(luts));
         strlcpy(luts.l_sysname, linux_sysname, sizeof(luts.l_sysname));
         strlcpy(luts.l_nodename, hostname, sizeof(luts.l_nodename));
         strlcpy(luts.l_release, "2.4.0", sizeof(luts.l_release));
         strlcpy(luts.l_version, linux_version, sizeof(luts.l_version));
         strlcpy(luts.l_machine, machine, sizeof(luts.l_machine));
         strlcpy(luts.l_domainname, domainname, sizeof(luts.l_domainname));
         return copyout(&luts, SCARG(uap, up), sizeof(luts));
 #else
 	return linux_sys_uname(l, (const void *)uap, retval);
 #endif
+}

--- src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c 2012/02/21 18:10:00	1.24
+++ src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c 2023/06/21 21:04:02	1.24.32.1

 @@ -1,14 +1,14 @@
-/* $NetBSD: linux_exec_powerpc.c,v 1.24 2012/02/21 18:10:00 rjs Exp $ */
+/* $NetBSD: linux_exec_powerpc.c,v 1.24.32.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -31,27 +31,27 @@
 /*
  * From NetBSD's sys/compat/arch/alpha/linux_exec_alpha.c, with some
  * powerpc add-ons (ifdef LINUX_SHIFT).
+ *
  * This code is to be common to alpha and powerpc. If it works on alpha, it
  * should be moved to common/linux_exec_elf32.c. Beware that it needs
  * LINUX_ELF_AUX_ENTRIES in arch/<arch>/linux_exec.h to also be moved to common
+ *
  * Emmanuel Dreyfus <p99dreyf@criens.u-psud.fr>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_powerpc.c,v 1.24 2012/02/21 18:10:00 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_powerpc.c,v 1.24.32.1 2023/06/21 21:04:02 martin Exp $");
 #define ELFSIZE 32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/resourcevar.h>
 #include <sys/kauth.h>
 #include <uvm/uvm_extern.h>
 @@ -83,27 +83,27 @@ ELFNAME2(linux,copyargs)(struct lwp *l,
 	if ((error = copyargs(l, pack, arginfo, stackp, argp)) != 0)
 		return error;
 #ifdef LINUX_SHIFT
 	/*
 	 * From Linux's arch/ppc/kernel/process.c:shove_aux_table(). GNU ld.so
 	 * expects the ELF auxiliary table to start on a 16 bytes boundary on
 	 * the PowerPC.
 	 */
 	*stackp = (char *)(((unsigned long)(*stackp) + LINUX_SHIFT)
 	    & ~LINUX_SHIFT);
 #endif
-	memset(ai, 0, sizeof(AuxInfo) * LINUX_ELF_AUX_ENTRIES);
+	memset(ai, 0, sizeof(ai));
 	a = ai;
 	/*
 	 * Push extra arguments on the stack needed by dynamically
 	 * linked binaries.
 	 */
 	if ((ap = (struct elf_args *)pack->ep_emul_arg)) {
 #if 1
 		/*
 		 * The exec_package doesn't have a proc pointer and it's not
 		 * exactly trivial to add one since the credentials are
 		 * changing. XXX Linux uses curlwp's credentials.

--- src/sys/compat/linux/arch/powerpc/linux_machdep.c 2017/05/03 00:23:42	1.50
+++ src/sys/compat/linux/arch/powerpc/linux_machdep.c 2023/06/21 21:04:02	1.50.2.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_machdep.c,v 1.50 2017/05/03 00:23:42 chs Exp $ */
+/*	$NetBSD: linux_machdep.c,v 1.50.2.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50 2017/05/03 00:23:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50.2.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 @@ -152,26 +152,27 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	 */
 	memset(&sc, 0, sizeof sc);
 	sc.lsignal = (int)native_to_linux_signo[sig];
 	sc.lhandler = (unsigned long)catcher;
 	native_to_linux_old_extra_sigset(&sc.lmask, &sc._unused[3], mask);
 	sc.lregs = (struct linux_pt_regs*)fp;
 	/*
 	 * Setup the signal stack frame as Linux does it in
 	 * arch/ppc/kernel/signal.c:setup_frame()
+	 *
 	 * Save register context.
 	 */
 	memset(&linux_regs, 0, sizeof(linux_regs));
 	for (i = 0; i < 32; i++)
 		linux_regs.lgpr[i] = tf->tf_fixreg[i];
 	linux_regs.lnip = tf->tf_srr0;
 	linux_regs.lmsr = tf->tf_srr1 & PSL_USERSRR1;
 	linux_regs.lorig_gpr3 = tf->tf_fixreg[3]; /* XXX Is that right? */
 	linux_regs.lctr = tf->tf_ctr;
 	linux_regs.llink = tf->tf_lr;
 	linux_regs.lxer = tf->tf_xer;
 	linux_regs.lccr = tf->tf_cr;
 	linux_regs.lmq = 0;  			/* Unused, 601 only */
 	linux_regs.ltrap = tf->tf_exc;
 	linux_regs.ldar = tf->tf_dar;
 	linux_regs.ldsisr = tf->tf_dsisr;

--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c 2018/04/12 13:42:49	1.29.10.1
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c 2023/06/21 21:04:02	1.29.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_ptrace.c,v 1.29.10.1 2018/04/12 13:42:49 martin Exp $ */
+/*	$NetBSD: linux_ptrace.c,v 1.29.10.2 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthias Scheler and Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.29.10.1 2018/04/12 13:42:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.29.10.2 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <machine/reg.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_ptrace.h>
 @@ -190,26 +190,27 @@ linux_sys_ptrace_arch(struct lwp *l, con
 		error = ENOSYS;
 		goto out;
+	}
 	lt = LIST_FIRST(&t->p_lwps);
 	*retval = 0;
 	switch (request) {
 	case LINUX_PTRACE_GETREGS:
 		error = process_read_regs(lt, regs);
 		mutex_exit(t->p_lock);
 		if (error) {
 			break;
+		}
 		memset(linux_regs, 0, sizeof(*linux_regs));
 		for (i = 0; i <= 31; i++) {
 			linux_regs->lgpr[i] = regs->fixreg[i];
+		}
 		linux_regs->lnip = regs->pc;
 		linux_regs->lmsr = 0;
 		/* XXX Is that right? */
 		linux_regs->lorig_gpr3 = regs->fixreg[3];
 		linux_regs->lctr = regs->ctr;
 		linux_regs->llink = regs->lr;
 		linux_regs->lxer = regs->xer;
 		linux_regs->lccr = regs->cr;
 		linux_regs->lmq = 0;
 		linux_regs->ltrap = 0;
 @@ -299,27 +300,27 @@ linux_sys_ptrace_arch(struct lwp *l, con
 			error = 1;
 		else if (addr == LUSR_OFF(u_comm))
 			error = 1;
 		else {
 #ifdef DEBUG_LINUX
 			printf("linux_ptrace: unsupported address: %d\n", addr);
 #endif
 			error = 1;
+		}
 		if (error) {
 			break;
+		}
 		error = copyout (retval, (void *)SCARG(uap, data),
-		    sizeof(retval));
+		    sizeof(*retval));
 		*retval = SCARG(uap, data);
 		break;
 	case  LINUX_PTRACE_POKEUSR: /* XXX Not tested */
 		addr = SCARG(uap, addr);
 		error = process_read_regs(lt, regs);
 		if (error) {
 			mutex_exit(t->p_lock);
 			break;
+		}
 		error = 0;
 		if ((addr < LUSR_OFF(lusr_startgdb)) ||
 		    (addr > LUSR_OFF(lu_comm_end)))

--- src/sys/compat/linux/common/linux_cdrom.c 2008/04/28 20:23:43	1.27
+++ src/sys/compat/linux/common/linux_cdrom.c 2023/06/21 21:04:02	1.27.80.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_cdrom.c,v 1.27 2008/04/28 20:23:43 martin Exp $ */
+/*	$NetBSD: linux_cdrom.c,v 1.27.80.1 2023/06/21 21:04:02 martin Exp $ */
 /*
  * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.27 2008/04/28 20:23:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.27.80.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/cdio.h>
 #include <sys/dvdio.h>
 #include <sys/malloc.h>
 #include <sys/syscallargs.h>
 @@ -176,26 +176,27 @@ linux_ioctl_cdrom(struct lwp *l, const s
 		t_track.start_track = l_ti.cdti_trk0;
 		t_track.start_index = l_ti.cdti_ind0;
 		t_track.end_track = l_ti.cdti_trk1;
 		t_track.end_index = l_ti.cdti_ind1;
 		error = ioctlf(fp, CDIOCPLAYTRACKS, &t_track);
 		break;
 	case LINUX_CDROMREADTOCHDR:
 		error = ioctlf(fp, CDIOREADTOCHEADER, &t_header);
 		if (error)
 			break;
 		memset(&l_tochdr, 0, sizeof(l_tochdr));
 		l_tochdr.cdth_trk0 = t_header.starting_track;
 		l_tochdr.cdth_trk1 = t_header.ending_track;
 		error = copyout(&l_tochdr, SCARG(uap, data), sizeof l_tochdr);
 		break;
 	case LINUX_CDROMREADTOCENTRY:
 		error = copyin(SCARG(uap, data), &l_tocentry,
 			       sizeof l_tocentry);
 		if (error)
 			break;
 		t_toc_entry.req.address_format = l_tocentry.cdte_format;
 @@ -228,26 +229,27 @@ linux_ioctl_cdrom(struct lwp *l, const s
 		t_vol.vol[0] = l_volctrl.channel0;
 		t_vol.vol[1] = l_volctrl.channel1;
 		t_vol.vol[2] = l_volctrl.channel2;
 		t_vol.vol[3] = l_volctrl.channel3;
 		error = ioctlf(fp, CDIOCSETVOL, &t_vol);
 		break;
 	case LINUX_CDROMVOLREAD:
 		error = ioctlf(fp, CDIOCGETVOL, &t_vol);
 		if (error)
 			break;
 		memset(&l_volctrl, 0, sizeof(l_volctrl));
 		l_volctrl.channel0 = t_vol.vol[0];
 		l_volctrl.channel1 = t_vol.vol[1];
 		l_volctrl.channel2 = t_vol.vol[2];
 		l_volctrl.channel3 = t_vol.vol[3];
 		error = copyout(&l_volctrl, SCARG(uap, data), sizeof l_volctrl);
 		break;
 	case LINUX_CDROMSUBCHNL:
 		error = copyin(SCARG(uap, data), &l_subchnl, sizeof l_subchnl);
 		if (error)
 			break;

--- src/sys/compat/linux/common/linux_fdio.c 2008/03/21 21:54:58	1.13
+++ src/sys/compat/linux/common/linux_fdio.c 2023/06/21 21:04:02	1.13.84.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_fdio.c,v 1.13 2008/03/21 21:54:58 ad Exp $	*/
+/*	$NetBSD: linux_fdio.c,v 1.13.84.1 2023/06/21 21:04:02 martin Exp $	*/
 /*
  * Copyright (c) 2000 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_fdio.c,v 1.13 2008/03/21 21:54:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_fdio.c,v 1.13.84.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/disklabel.h>
 #include <sys/fdio.h>
 #include <sys/syscallargs.h>
 @@ -97,26 +97,27 @@ linux_ioctl_fdio(struct lwp *l, const st
 		 * Just fill in some innocent defaults.
 		 */
 		memset(&ldrive, 0, sizeof ldrive);
 		ldrive.fd_ref = 1;
 		ldrive.maxblock = 2;
 		ldrive.maxtrack = ldrive.track = 1;
 		ldrive.flags = LINUX_FD_DISK_WRITABLE;
 		error = copyout(&ldrive, SCARG(uap, data), sizeof ldrive);
 		break;
 	case LINUX_FDGETPRM:
 		error = ioctlf(fp, FDIOCGETFORMAT, &fparams);
 		if (error != 0)
 			break;
 		memset(&lflop, 0, sizeof(lflop));
 		lflop.size = fparams.ncyl * fparams.nspt * fparams.ntrk;
 		lflop.sect = fparams.nspt;
 		lflop.head = fparams.ntrk;
 		lflop.track = fparams.ncyl;
 		lflop.stretch = fparams.stepspercyl == 2 ? 1 : 0;
 		lflop.fmt_gap = fparams.gaplen;
 		/*
 		 * XXXX Use knowledge of floppy for these fields.
 		 * FDIOCGETFORMAT does not provide enough information.
 		 * It would be better to have FDIOCGETFORMAT return more
 		 * information.
 		 */
 		switch (fparams.xfer_rate) {

--- src/sys/compat/linux/common/linux_file.c 2015/03/01 13:19:39	1.115
+++ src/sys/compat/linux/common/linux_file.c 2023/06/21 21:04:02	1.115.10.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $	*/
+/*	$NetBSD: linux_file.c,v 1.115.10.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions in multiarch:
  *	linux_sys_llseek	: linux_llseek.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.115.10.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 @@ -435,26 +435,27 @@ linux_sys_fcntl(struct lwp *l, const str
 #if !defined(__amd64__)
 /*
  * Convert a NetBSD stat structure to a Linux stat structure.
  * Only the order of the fields and the padding in the structure
  * is different. linux_fakedev is a machine-dependent function
  * which optionally converts device driver major/minor numbers
  * (XXX horrible, but what can you do against code that compares
  * things against constant major device numbers? sigh)
  */
 static void
 bsd_to_linux_stat(struct stat *bsp, struct linux_stat *lsp)
+{
 	memset(lsp, 0, sizeof(*lsp));
 	lsp->lst_dev     = linux_fakedev(bsp->st_dev, 0);
 	lsp->lst_ino     = bsp->st_ino;
 	lsp->lst_mode    = (linux_mode_t)bsp->st_mode;
 	if (bsp->st_nlink >= (1 << 15))
 		lsp->lst_nlink = (1 << 15) - 1;
 	else
 		lsp->lst_nlink = (linux_nlink_t)bsp->st_nlink;
 	lsp->lst_uid     = bsp->st_uid;
 	lsp->lst_gid     = bsp->st_gid;
 	lsp->lst_rdev    = linux_fakedev(bsp->st_rdev, 1);
 	lsp->lst_size    = bsp->st_size;
 	lsp->lst_blksize = bsp->st_blksize;
 	lsp->lst_blocks  = bsp->st_blocks;

--- src/sys/compat/linux/common/linux_hdio.c 2015/12/08 20:36:14	1.17
+++ src/sys/compat/linux/common/linux_hdio.c 2023/06/21 21:04:02	1.17.10.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_hdio.c,v 1.17 2015/12/08 20:36:14 christos Exp $	*/
+/*	$NetBSD: linux_hdio.c,v 1.17.10.1 2023/06/21 21:04:02 martin Exp $	*/
 /*
  * Copyright (c) 2000 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.17 2015/12/08 20:36:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.17.10.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/disklabel.h>
 #include <dev/ata/atareg.h>
 #include <dev/ic/wdcreg.h>
 #include <sys/ataio.h>
 @@ -103,43 +103,45 @@ linux_ioctl_hdio(struct lwp *l, const st
 		if (req.retsts != ATACMD_OK)
 			error = EIO;
 		break;
 	case LINUX_HDIO_GETGEO:
 		error = linux_machdepioctl(l, uap, retval);
 		if (error == 0)
 			break;
 		error = ioctlf(fp, DIOCGDINFO, &label);
 		error1 = ioctlf(fp, DIOCGPARTINFO, &pi);
 		if (error != 0 && error1 != 0) {
 			error = error1;
 			break;
+		}
 		memset(&hdg, 0, sizeof(hdg));
 		hdg.start = error1 != 0 ? pi.pi_offset : 0;
 		hdg.heads = label.d_ntracks;
 		hdg.cylinders = label.d_ncylinders;
 		hdg.sectors = label.d_nsectors;
 		error = copyout(&hdg, SCARG(uap, data), sizeof hdg);
 		break;
 	case LINUX_HDIO_GETGEO_BIG:
 		error = linux_machdepioctl(l, uap, retval);
 		if (error == 0)
 			break;
 	case LINUX_HDIO_GETGEO_BIG_RAW:
 		error = ioctlf(fp, DIOCGDINFO, &label);
 		error1 = ioctlf(fp, DIOCGPARTINFO, &pi);
 		if (error != 0 && error1 != 0) {
 			error = error1;
 			break;
+		}
 		memset(&hdg_big, 0, sizeof(hdg_big));
 		hdg_big.start = error1 != 0 ? pi.pi_offset : 0;
 		hdg_big.heads = label.d_ntracks;
 		hdg_big.cylinders = label.d_ncylinders;
 		hdg_big.sectors = label.d_nsectors;
 		error = copyout(&hdg_big, SCARG(uap, data), sizeof hdg_big);
 		break;
 	case LINUX_HDIO_GET_UNMASKINTR:
 	case LINUX_HDIO_GET_MULTCOUNT:
 	case LINUX_HDIO_GET_KEEPSETTINGS:
 	case LINUX_HDIO_GET_32BIT:
 	case LINUX_HDIO_GET_NOWERR:
 	case LINUX_HDIO_GET_DMA:
 	case LINUX_HDIO_GET_NICE:

--- src/sys/compat/linux/common/linux_misc.c 2020/01/21 18:12:54	1.238.2.2
+++ src/sys/compat/linux/common/linux_misc.c 2023/06/21 21:04:02	1.238.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.238.2.2 2020/01/21 18:12:54 martin Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.238.2.3 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -47,27 +47,27 @@
  *	linux_sys_readdir		: linux_misc_notalpha.c
  *	linux_sys_setresgid		: linux_misc_notalpha.c
  *	linux_sys_time			: linux_misc_notalpha.c
  *	linux_sys_utime			: linux_misc_notalpha.c
  *	linux_sys_waitpid		: linux_misc_notalpha.c
  *	linux_sys_old_mmap		: linux_oldmmap.c
  *	linux_sys_oldolduname		: linux_oldolduname.c
  *	linux_sys_oldselect		: linux_oldselect.c
  *	linux_sys_olduname		: linux_olduname.c
  *	linux_sys_pipe			: linux_pipe.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.238.2.2 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.238.2.3 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -618,26 +618,28 @@ int
 linux_sys_times(struct lwp *l, const struct linux_sys_times_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct times *) tms;
 	} */
 	struct proc *p = l->l_proc;
 	struct timeval t;
 	int error;
 	if (SCARG(uap, tms)) {
 		struct linux_tms ltms;
 		struct rusage ru;
 		memset(&ltms, 0, sizeof(ltms));
 		mutex_enter(p->p_lock);
 		calcru(p, &ru.ru_utime, &ru.ru_stime, NULL, NULL);
 		ltms.ltms_utime = CONVTCK(ru.ru_utime);
 		ltms.ltms_stime = CONVTCK(ru.ru_stime);
 		ltms.ltms_cutime = CONVTCK(p->p_stats->p_cru.ru_utime);
 		ltms.ltms_cstime = CONVTCK(p->p_stats->p_cru.ru_stime);
 		mutex_exit(p->p_lock);
 		if ((error = copyout(&ltms, SCARG(uap, tms), sizeof ltms)))
 			return error;
+	}
 	getmicrouptime(&t);
 @@ -1382,26 +1384,27 @@ linux_sys_getrlimit(struct lwp *l, const
 # endif
 	} */
 # ifdef LINUX_LARGEFILE64
 	struct rlimit orl;
 # else
 	struct orlimit orl;
 # endif
 	int which;
 	which = linux_to_bsd_limit(SCARG(uap, which));
 	if (which < 0)
 		return -which;
 	memset(&orl, 0, sizeof(orl));
 	bsd_to_linux_rlimit(&orl, &l->l_proc->p_rlimit[which]);
 	return copyout(&orl, SCARG(uap, rlp), sizeof(orl));
+}
 int
 linux_sys_setrlimit(struct lwp *l, const struct linux_sys_setrlimit_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 # ifdef LINUX_LARGEFILE64
 		syscallarg(struct rlimit *) rlp;
 # else

--- src/sys/compat/linux/common/linux_mtio.c 2008/03/21 21:54:58	1.7
+++ src/sys/compat/linux/common/linux_mtio.c 2023/06/21 21:04:02	1.7.84.1

 @@ -1,14 +1,14 @@
-/* $NetBSD: linux_mtio.c,v 1.7 2008/03/21 21:54:58 ad Exp $ */
+/* $NetBSD: linux_mtio.c,v 1.7.84.1 2023/06/21 21:04:02 martin Exp $ */
 /*
  * Copyright (c) 2005 Soren S. Jorvang.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.7 2008/03/21 21:54:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.7.84.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/mtio.h>
 #include <sys/syscallargs.h>
 @@ -96,26 +96,27 @@ linux_ioctl_mtio(struct lwp *l, const st
 				break;
+		}
 		if (mtop_map[i].lop == -1) {
 			error = EINVAL;
 			break;
+		}
 		mt.mt_op = mtop_map[i].op;
 		mt.mt_count = lmtop.mt_count;
 		error = ioctlf(fp, MTIOCTOP, &mt);
 		break;
 	case LINUX_MTIOCGET:
 		memset(&lmtget, 0, sizeof(lmtget));
 		lmtget.mt_type = LINUX_MT_ISUNKNOWN;
 		lmtget.mt_resid = 0;
 		lmtget.mt_dsreg = 0;
 		lmtget.mt_gstat = 0;
 		lmtget.mt_erreg = 0;
 		lmtget.mt_fileno = 0;
 		lmtget.mt_blkno = 0;
                 error = copyout(&lmtget, SCARG(uap, data), sizeof lmtget);
 		break;
 	case LINUX_MTIOCPOS:
 	default:
 		printf("linux_mtio unsupported ioctl 0x%lx\n", com);
 		error = ENODEV;

--- src/sys/compat/linux/common/linux_oldolduname.c 2008/04/28 20:23:43	1.66
+++ src/sys/compat/linux/common/linux_oldolduname.c 2023/06/21 21:04:02	1.66.80.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_oldolduname.c,v 1.66 2008/04/28 20:23:43 martin Exp $	*/
+/*	$NetBSD: linux_oldolduname.c,v 1.66.80.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_oldolduname.c,v 1.66 2008/04/28 20:23:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_oldolduname.c,v 1.66.80.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_mmap.h>
 #include <compat/linux/common/linux_signal.h>
 #include <compat/linux/common/linux_oldolduname.h>
 #include <compat/linux/common/linux_machdep.h>
 @@ -48,21 +48,23 @@ __KERNEL_RCSID(0, "$NetBSD: linux_oldold
 #include <compat/linux/linux_syscallargs.h>
 /* Used on: arm, i386, mips, ppc */
 /* Not used on: alpha, m68k, sparc, sparc64 */
 int
 linux_sys_oldolduname(struct lwp *l, const struct linux_sys_oldolduname_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct linux_oldoldutsname *) up;
 	} */
 	struct linux_oldoldutsname luts;
 	memset(&luts, 0, sizeof(luts));
 	strlcpy(luts.l_sysname, linux_sysname, sizeof(luts.l_sysname));
 	strlcpy(luts.l_nodename, hostname, sizeof(luts.l_nodename));
 	strlcpy(luts.l_release, linux_release, sizeof(luts.l_release));
 	strlcpy(luts.l_version, linux_version, sizeof(luts.l_version));
 	strlcpy(luts.l_machine, LINUX_UNAME_ARCH, sizeof(luts.l_machine));
 	return copyout(&luts, SCARG(uap, up), sizeof(luts));
+}

--- src/sys/compat/linux/common/linux_olduname.c 2008/04/28 20:23:43	1.66
+++ src/sys/compat/linux/common/linux_olduname.c 2023/06/21 21:04:02	1.66.80.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_olduname.c,v 1.66 2008/04/28 20:23:43 martin Exp $	*/
+/*	$NetBSD: linux_olduname.c,v 1.66.80.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_olduname.c,v 1.66 2008/04/28 20:23:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_olduname.c,v 1.66.80.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_mmap.h>
 #include <compat/linux/common/linux_signal.h>
 @@ -51,21 +51,23 @@ __KERNEL_RCSID(0, "$NetBSD: linux_olduna
 /* Used on: (alpha), arm, i386, mips, ppc */
 /* Not used on: sparc */
 /* Alpha: XXX Only if we assume osf_utsname is used by Linux programs. */
 int
 linux_sys_olduname(struct lwp *l, const struct linux_sys_olduname_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct linux_oldutsname *) up;
 	} */
 	struct linux_oldutsname luts;
 	memset(&luts, 0, sizeof(luts));
 	strlcpy(luts.l_sysname, linux_sysname, sizeof(luts.l_sysname));
 	strlcpy(luts.l_nodename, hostname, sizeof(luts.l_nodename));
 	strlcpy(luts.l_release, linux_release, sizeof(luts.l_release));
 	strlcpy(luts.l_version, linux_version, sizeof(luts.l_version));
 	strlcpy(luts.l_machine, LINUX_UNAME_ARCH, sizeof(luts.l_machine));
 	return copyout(&luts, SCARG(uap, up), sizeof(luts));
+}

--- src/sys/compat/linux/common/linux_sched.c 2017/04/21 15:10:34	1.69
+++ src/sys/compat/linux/common/linux_sched.c 2023/06/21 21:04:02	1.69.4.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sched.c,v 1.69 2017/04/21 15:10:34 christos Exp $	*/
+/*	$NetBSD: linux_sched.c,v 1.69.4.1 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; by Matthias Scheler.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Linux compatibility module. Try to deal with scheduler related syscalls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.69 2017/04/21 15:10:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.69.4.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/syscallargs.h>
 #include <sys/wait.h>
 #include <sys/kauth.h>
 #include <sys/ptrace.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 @@ -371,26 +371,28 @@ sched_native2linux(int native_policy, st
 		break;
 	default:
 		panic("%s: unknown policy %d\n", __func__, native_policy);
+	}
 	if (native_params != NULL) {
 		int prio = native_params->sched_priority;
 		KASSERT(prio >= SCHED_PRI_MIN);
 		KASSERT(prio <= SCHED_PRI_MAX);
 		KASSERT(linux_params != NULL);
 		memset(linux_params, 0, sizeof(*linux_params));
 		DPRINTF(("%s: native: policy %d, priority %d\n",
 		    __func__, native_policy, prio));
 		if (native_policy == SCHED_OTHER) {
 			linux_params->sched_priority = 0;
 		} else {
 			linux_params->sched_priority =
 			    (prio - SCHED_PRI_MIN)
 			    * (LINUX_SCHED_RTPRIO_MAX - LINUX_SCHED_RTPRIO_MIN)
 			    / (SCHED_PRI_MAX - SCHED_PRI_MIN)
 			    + LINUX_SCHED_RTPRIO_MIN;
+		}
 		DPRINTF(("%s: linux: policy %d, priority %d\n",

--- src/sys/compat/linux/common/linux_signal.c 2020/01/21 18:12:54	1.79.6.1
+++ src/sys/compat/linux/common/linux_signal.c 2023/06/21 21:04:02	1.79.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_signal.c,v 1.79.6.1 2020/01/21 18:12:54 martin Exp $	*/
+/*	$NetBSD: linux_signal.c,v 1.79.6.2 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -38,27 +38,27 @@
  *	linux_sys_siggetmask	: linux_sig_notalpha.c
  *	linux_sys_sigsetmask	: linux_sig_notalpha.c
  *	linux_sys_pause		: linux_sig_notalpha.c
  *	linux_sys_sigaction	: linux_sigaction.c
+ *
  */
 /*
  *   Unimplemented:
  *	linux_sys_rt_sigtimedwait	: sigsuspend w/timeout.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.79.6.1 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.79.6.2 2023/06/21 21:04:02 martin Exp $");
 #define COMPAT_LINUX 1
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 @@ -264,54 +264,62 @@ linux_to_native_sigflags(const unsigned
 	if ((lsf & ~LINUX_SA_ALLBITS) != 0) {
 		DPRINTF(("linux_old_to_native_sigflags: "
 		    "%lx extra bits ignored\n", lsf));
+	}
 	return bsf;
+}
 /*
  * Convert between Linux and BSD sigaction structures.
  */
 void
 linux_old_to_native_sigaction(struct sigaction *bsa, const struct linux_old_sigaction *lsa)
+{
 	memset(bsa, 0, sizeof(*bsa));
 	bsa->sa_handler = lsa->linux_sa_handler;
 	linux_old_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask);
 	bsa->sa_flags = linux_to_native_sigflags(lsa->linux_sa_flags);
+}
 void
 native_to_linux_old_sigaction(struct linux_old_sigaction *lsa, const struct sigaction *bsa)
+{
 	memset(lsa, 0, sizeof(*lsa));
 	lsa->linux_sa_handler = bsa->sa_handler;
 	native_to_linux_old_sigset(&lsa->linux_sa_mask, &bsa->sa_mask);
 	lsa->linux_sa_flags = native_to_linux_sigflags(bsa->sa_flags);
 #ifndef __alpha__
 	lsa->linux_sa_restorer = NULL;
 #endif
+}
 /* ...and the new sigaction conversion funcs. */
 void
 linux_to_native_sigaction(struct sigaction *bsa, const struct linux_sigaction *lsa)
+{
 	memset(bsa, 0, sizeof(*bsa));
 	bsa->sa_handler = lsa->linux_sa_handler;
 	linux_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask);
 	bsa->sa_flags = linux_to_native_sigflags(lsa->linux_sa_flags);
+}
 void
 native_to_linux_sigaction(struct linux_sigaction *lsa, const struct sigaction *bsa)
+{
 	memset(lsa, 0, sizeof(*lsa));
 	lsa->linux_sa_handler = bsa->sa_handler;
 	native_to_linux_sigset(&lsa->linux_sa_mask, &bsa->sa_mask);
 	lsa->linux_sa_flags = native_to_linux_sigflags(bsa->sa_flags);
 #ifndef __alpha__
 	lsa->linux_sa_restorer = NULL;
 #endif
+}
 /* ----------------------------------------------------------------------- */
 /*
  * The Linux sigaction() system call. Do the usual conversions,
  * and just call sigaction(). Some flags and values are silently

--- src/sys/compat/linux/common/linux_socket.c 2020/07/17 15:28:08	1.138.6.6
+++ src/sys/compat/linux/common/linux_socket.c 2023/06/21 21:04:02	1.138.6.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_socket.c,v 1.138.6.6 2020/07/17 15:28:08 martin Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.138.6.7 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Functions in multiarch:
  *	linux_sys_socketcall		: linux_socketcall.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.6 2020/07/17 15:28:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.138.6.7 2023/06/21 21:04:02 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif /* defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -445,38 +445,40 @@ linux_sys_sendto(struct lwp *l, const st
 	msg.msg_iov = &aiov;
 	msg.msg_iovlen = 1;
 	aiov.iov_base = __UNCONST(SCARG(uap, msg));
 	aiov.iov_len = SCARG(uap, len);
 	return do_sys_sendmsg(l, SCARG(uap, s), &msg, bflags,
 	    NULL, 0, retval);
+}
 static void
 linux_to_bsd_msghdr(const struct linux_msghdr *lmsg, struct msghdr *bmsg)
+{
 	memset(bmsg, 0, sizeof(*bmsg));
 	bmsg->msg_name = lmsg->msg_name;
 	bmsg->msg_namelen = lmsg->msg_namelen;
 	bmsg->msg_iov = lmsg->msg_iov;
 	bmsg->msg_iovlen = lmsg->msg_iovlen;
 	bmsg->msg_control = lmsg->msg_control;
 	bmsg->msg_controllen = lmsg->msg_controllen;
 	bmsg->msg_flags = lmsg->msg_flags;
+}
 static void
 bsd_to_linux_msghdr(const struct msghdr *bmsg, struct linux_msghdr *lmsg)
+{
 	memset(lmsg, 0, sizeof(*lmsg));
 	lmsg->msg_name = bmsg->msg_name;
 	lmsg->msg_namelen = bmsg->msg_namelen;
 	lmsg->msg_iov = bmsg->msg_iov;
 	lmsg->msg_iovlen = bmsg->msg_iovlen;
 	lmsg->msg_control = bmsg->msg_control;
 	lmsg->msg_controllen = bmsg->msg_controllen;
 	lmsg->msg_flags = bmsg->msg_flags;
+}
 int
 linux_sys_sendmsg(struct lwp *l, const struct linux_sys_sendmsg_args *uap, register_t *retval)
+{
 	/* {
 @@ -705,26 +707,27 @@ linux_copyout_msg_control(struct lwp *l,
 	q = (char *)mp->msg_control;
 	q_end = q + mp->msg_controllen;
 	for (m = control; m != NULL; ) {
 		cmsg = mtod(m, struct cmsghdr *);
 		/*
 		 * Fixup cmsg. We handle two things:
 		 * 0. different sizeof cmsg_len.
 		 * 1. different values for level/type on some archs
 		 * 2. different alignment of CMSG_DATA on some archs
 		 */
 		memset(&linux_cmsg, 0, sizeof(linux_cmsg));
 		linux_cmsg.cmsg_len = cmsg->cmsg_len - LINUX_CMSG_ALIGN_DELTA;
 		linux_cmsg.cmsg_level = cmsg->cmsg_level;
 		linux_cmsg.cmsg_type = cmsg->cmsg_type;
 		dlen = q_end - q;
 		if (linux_cmsg.cmsg_len > dlen) {
 			/* Not enough room for the parameter */
 			dlen -= sizeof linux_cmsg;
 			if (dlen <= 0)
 				/* Discard if header wont fit */
 				break;
 			mp->msg_flags |= MSG_CTRUNC;
 			if (linux_cmsg.cmsg_level == SOL_SOCKET

--- src/sys/compat/linux/common/linux_time.c 2017/08/08 15:59:04	1.37.22.1
+++ src/sys/compat/linux/common/linux_time.c 2023/06/21 21:04:02	1.37.22.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_time.c,v 1.37.22.1 2017/08/08 15:59:04 martin Exp $ */
+/*	$NetBSD: linux_time.c,v 1.37.22.2 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.37.22.1 2017/08/08 15:59:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.37.22.2 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/kauth.h>
 #include <sys/mount.h>
 #include <sys/signal.h>
 #include <sys/stdint.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/sched.h>
 #include <sys/syscallargs.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 @@ -107,33 +107,35 @@ linux_sys_settimeofday(struct lwp *l, co
 			KAUTH_GENERIC_ISSUSER, NULL) != 0)
 			return (EPERM);
 		error = copyin(SCARG(uap, tzp), &linux_sys_tz, sizeof(linux_sys_tz));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 void
 native_to_linux_timespec(struct linux_timespec *ltp, struct timespec *ntp)
+{
 	memset(ltp, 0, sizeof(*ltp));
 	ltp->tv_sec = ntp->tv_sec;
 	ltp->tv_nsec = ntp->tv_nsec;
+}
 void
 linux_to_native_timespec(struct timespec *ntp, struct linux_timespec *ltp)
+{
 	memset(ntp, 0, sizeof(*ntp));
 	ntp->tv_sec = ltp->tv_sec;
 	ntp->tv_nsec = ltp->tv_nsec;
+}
 int
 linux_sys_nanosleep(struct lwp *l, const struct linux_sys_nanosleep_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(struct linux_timespec *) rqtp;
 		syscallarg(struct linux_timespec *) rmtp;
 	} */
 	struct timespec rqts, rmts;

--- src/sys/compat/linux32/arch/amd64/linux32_machdep.c 2019/04/05 07:48:05	1.38.6.2
+++ src/sys/compat/linux32/arch/amd64/linux32_machdep.c 2023/06/21 21:04:03	1.38.6.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_machdep.c,v 1.38.6.2 2019/04/05 07:48:05 martin Exp $ */
+/*	$NetBSD: linux32_machdep.c,v 1.38.6.3 2023/06/21 21:04:03 martin Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.38.6.2 2019/04/05 07:48:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.38.6.3 2023/06/21 21:04:03 martin Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
 #include <machine/vmparam.h>
 #include <machine/cpufunc.h>
 #include <machine/netbsd32_machdep.h>
 #include <x86/fpu.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 @@ -112,26 +112,28 @@ linux32_old_sendsig(const ksiginfo_t *ks
 	/* Allocate space for the signal handler context. */
 	if (onstack)
 		fp = (struct linux32_sigframe *)((char *)sas->ss_sp +
 		    sas->ss_size);
 	else
 		fp = (struct linux32_sigframe *)tf->tf_rsp;
 	fp--;
 	DPRINTF(("old: onstack = %d, fp = %p sig = %d rip = 0x%lx\n",
 	    onstack, fp, sig, tf->tf_rip));
 	memset(&frame, 0, sizeof(frame));
 	/* Build stack frame for signal trampoline. */
 	NETBSD32PTR32(frame.sf_handler, catcher);
 	frame.sf_sig = native_to_linux32_signo[sig];
 	linux32_save_sigcontext(l, tf, mask, &frame.sf_sc);
 	sendsig_reset(l, sig);
 	mutex_exit(p->p_lock);
 	error = copyout(&frame, fp, sizeof(frame));
 	mutex_enter(p->p_lock);
 	if (error != 0) {
 		/*

--- src/sys/compat/linux32/common/linux32_exec_elf32.c 2016/08/06 15:13:13	1.19
+++ src/sys/compat/linux32/common/linux32_exec_elf32.c 2023/06/21 21:04:02	1.19.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_exec_elf32.c,v 1.19 2016/08/06 15:13:13 maxv Exp $ */
+/*	$NetBSD: linux32_exec_elf32.c,v 1.19.8.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 1995, 1998, 2000, 2001,2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Emmanuel Dreyfus.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_exec_elf32.c,v 1.19 2016/08/06 15:13:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_exec_elf32.c,v 1.19.8.1 2023/06/21 21:04:02 martin Exp $");
 #define	ELFSIZE		32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 @@ -217,26 +217,28 @@ linux32_elf32_copyargs(struct lwp *l, st
 	a++;
 	randbytes[0] = cprng_strong32();
 	randbytes[1] = cprng_strong32();
 	randbytes[2] = cprng_strong32();
 	randbytes[3] = cprng_strong32();
 	len = sizeof(randbytes);
 	if ((error = copyout(randbytes, *stackp, len)) != 0)
 		return error;
 	*stackp += len;
 #if 0
 	memset(&esd, 0, sizeof(esd));
 	memcpy(esd.kernel_vsyscall, linux32_kernel_vsyscall,
 	    sizeof(linux32_kernel_vsyscall));
 	memcpy(&esd.elfhdr, eh, sizeof(*eh));
 	strcpy(esd.hw_platform, LINUX32_PLATFORM);
 	/*
 	 * Copy out the ELF auxiliary table and hw platform name
 	 */
 	if ((error = copyout(&esd, esdp, sizeof(esd))) != 0)
 		return error;
 	*stackp += sizeof(esd);

--- src/sys/compat/linux32/common/linux32_resource.c 2012/09/22 22:34:03	1.11
+++ src/sys/compat/linux32/common/linux32_resource.c 2023/06/21 21:04:02	1.11.30.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_resource.c,v 1.11 2012/09/22 22:34:03 joerg Exp $ */
+/*	$NetBSD: linux32_resource.c,v 1.11.30.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,27 +23,27 @@
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_resource.c,v 1.11 2012/09/22 22:34:03 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_resource.c,v 1.11.30.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/fstypes.h>
 #include <sys/signal.h>
 #include <sys/dirent.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/ucred.h>
 #include <sys/swap.h>
 @@ -77,26 +77,27 @@ int
 linux32_sys_getrlimit(struct lwp *l, const struct linux32_sys_getrlimit_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_orlimitp_t) rlp;
 	} */
 	struct orlimit orl;
 	int which;
 	which = linux_to_bsd_limit(SCARG(uap, which));
 	if (which < 0)
 		return -which;
 	memset(&orl, 0, sizeof(orl));
 	bsd_to_linux_rlimit(&orl, &l->l_proc->p_rlimit[which]);
 	return copyout(&orl, SCARG_P32(uap, rlp), sizeof(orl));
+}
 int
 linux32_sys_setrlimit(struct lwp *l, const struct linux32_sys_setrlimit_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) which;
 		syscallarg(netbsd32_orlimitp_t) rlp;
 	} */
 	struct rlimit rl;

--- src/sys/compat/linux32/common/linux32_signal.c 2020/01/21 18:12:54	1.18.10.1
+++ src/sys/compat/linux32/common/linux32_signal.c 2023/06/21 21:04:02	1.18.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_signal.c,v 1.18.10.1 2020/01/21 18:12:54 martin Exp $ */
+/*	$NetBSD: linux32_signal.c,v 1.18.10.2 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -22,27 +22,27 @@
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.18.10.1 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.18.10.2 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/ucred.h>
 #include <sys/signalvar.h>
 #include <sys/lwp.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/wait.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_signal.h>
 @@ -205,34 +205,36 @@ linux32_to_native_sigflags(const unsigne
 		bsf |= SA_SIGINFO;
 	if ((lsf & ~LINUX32_SA_ALLBITS) != 0) {
 #ifdef DEBUG_LINUX
 		printf("linux32_old_to_native_sigflags: "
 		    "%lx extra bits ignored\n", lsf);
 #endif
+	}
 	return bsf;
+}
 void
 linux32_to_native_sigaction(struct sigaction *bsa, const struct linux32_sigaction *lsa)
+{
 	memset(bsa, 0, sizeof(*bsa));
 	bsa->sa_handler = NETBSD32PTR64(lsa->linux_sa_handler);
 	linux32_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask);
 	bsa->sa_flags = linux32_to_native_sigflags(lsa->linux_sa_flags);
+}
 void
 native_to_linux32_sigaction(struct linux32_sigaction *lsa, const struct sigaction *bsa)
+{
 	memset(lsa, 0, sizeof(*lsa));
 	NETBSD32PTR32(lsa->linux_sa_handler, bsa->sa_handler);
 	native_to_linux32_sigset(&lsa->linux_sa_mask, &bsa->sa_mask);
 	lsa->linux_sa_flags = native_to_linux32_sigflags(bsa->sa_flags);
 	NETBSD32PTR32(lsa->linux_sa_restorer, NULL);
+}
 void
 native_to_linux32_sigaltstack(struct linux32_sigaltstack *lss, const struct sigaltstack *bss)
+{
 	memset(lss, 0, sizeof(*lss));
 	NETBSD32PTR32(lss->ss_sp, bss->ss_sp);
 	lss->ss_size = bss->ss_size;
 	if (bss->ss_flags & SS_ONSTACK)

--- src/sys/compat/linux32/common/linux32_time.c 2012/10/02 01:44:28	1.37
+++ src/sys/compat/linux32/common/linux32_time.c 2023/06/21 21:04:02	1.37.30.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_time.c,v 1.37 2012/10/02 01:44:28 christos Exp $ */
+/*	$NetBSD: linux32_time.c,v 1.37.30.1 2023/06/21 21:04:02 martin Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,27 +23,27 @@
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_time.c,v 1.37 2012/10/02 01:44:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_time.c,v 1.37.30.1 2023/06/21 21:04:02 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/fstypes.h>
 #include <sys/signal.h>
 #include <sys/dirent.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/namei.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 @@ -156,26 +156,28 @@ int
 linux32_sys_times(struct lwp *l, const struct linux32_sys_times_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(linux32_tmsp_t) tms;
 	} */
 	struct proc *p = l->l_proc;
 	struct timeval t;
 	int error;
 	if (SCARG_P32(uap, tms)) {
 		struct linux32_tms ltms32;
 		struct rusage ru;
 		memset(&ltms32, 0, sizeof(ltms32));
 		mutex_enter(p->p_lock);
 		calcru(p, &ru.ru_utime, &ru.ru_stime, NULL, NULL);
 		ltms32.ltms32_utime = CONVTCK(ru.ru_utime);
 		ltms32.ltms32_stime = CONVTCK(ru.ru_stime);
 		ltms32.ltms32_cutime = CONVTCK(p->p_stats->p_cru.ru_utime);
 		ltms32.ltms32_cstime = CONVTCK(p->p_stats->p_cru.ru_stime);
 		mutex_exit(p->p_lock);
 		error = copyout(&ltms32, SCARG_P32(uap, tms), sizeof(ltms32));
 		if (error)
 			return error;
+	}
 @@ -227,33 +229,37 @@ linux32_sys_utime(struct lwp *l, const s
 		tv[1].tv_usec = 0;
                 tvp = tv;
         } else {
 		tvp = NULL;
+	}
         return do_sys_utimes(l, NULL, SCARG_P32(uap, path), FOLLOW,
 			    tvp, UIO_SYSSPACE);
+}
 void
 native_to_linux32_timespec(struct linux32_timespec *ltp, struct timespec *ntp)
+{
 	memset(ltp, 0, sizeof(*ltp));
 	ltp->tv_sec = ntp->tv_sec;
 	ltp->tv_nsec = ntp->tv_nsec;
+}
 void
 linux32_to_native_timespec(struct timespec *ntp, struct linux32_timespec *ltp)
+{
 	memset(ntp, 0, sizeof(*ntp));
 	ntp->tv_sec = ltp->tv_sec;
 	ntp->tv_nsec = ltp->tv_nsec;
+}
 int
 linux32_sys_nanosleep(struct lwp *l,
     const struct linux32_sys_nanosleep_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(linux32_timespecp_t) rqtp;
 		syscallarg(linux32_timespecp_t) rmtp;
 	} */
 	struct timespec rqts, rmts;

--- src/sys/compat/netbsd32/netbsd32_compat_12.c 2012/12/10 02:21:58	1.33
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c 2023/06/21 21:04:01	1.33.30.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_compat_12.c,v 1.33 2012/12/10 02:21:58 chs Exp $	*/
+/*	$NetBSD: netbsd32_compat_12.c,v 1.33.30.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33 2012/12/10 02:21:58 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.30.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/mman.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
 @@ -49,26 +49,27 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
 #include <compat/sys/stat.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 static void netbsd32_stat12_to_netbsd32(struct stat12 *,
 		struct netbsd32_stat12 *);
 /* for use with {,fl}stat() */
 static void
 netbsd32_stat12_to_netbsd32(struct stat12 *sp12, struct netbsd32_stat12 *sp32)
+{
 	memset(sp32, 0, sizeof(*sp32));
 	sp32->st_dev = sp12->st_dev;
 	sp32->st_ino = sp12->st_ino;
 	sp32->st_mode = sp12->st_mode;
 	sp32->st_nlink = sp12->st_nlink;
 	sp32->st_uid = sp12->st_uid;
 	sp32->st_gid = sp12->st_gid;
 	sp32->st_rdev = sp12->st_rdev;
 	if (sp12->st_size < (quad_t)1 << 32)
 		sp32->st_size = sp12->st_size;
 	else
 		sp32->st_size = -2;
 	sp32->st_atimespec.tv_sec = sp12->st_atimespec.tv_sec;
 	sp32->st_atimespec.tv_nsec = sp12->st_atimespec.tv_nsec;

--- src/sys/compat/netbsd32/netbsd32_compat_20.c 2020/01/21 18:12:54	1.36.4.1
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c 2023/06/21 21:04:01	1.36.4.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_compat_20.c,v 1.36.4.1 2020/01/21 18:12:54 martin Exp $	*/
+/*	$NetBSD: netbsd32_compat_20.c,v 1.36.4.2 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,52 +17,54 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.4.1 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.4.2 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ktrace.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/namei.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/netbsd32/netbsd32_conv.h>
 static inline void compat_20_netbsd32_from_statvfs(struct statvfs *,
     struct netbsd32_statfs *);
 static inline void
 compat_20_netbsd32_from_statvfs(struct statvfs *sbp, struct netbsd32_statfs *sb32p)
+{
 	memset(sb32p, 0, sizeof(*sb32p));
 	sb32p->f_type = 0; /* XXX Put an actual value? */
 	sb32p->f_flags = sbp->f_flag;
 	sb32p->f_bsize = (netbsd32_long)sbp->f_bsize;
 	sb32p->f_iosize = (netbsd32_long)sbp->f_iosize;
 	sb32p->f_blocks = (netbsd32_long)sbp->f_blocks;
 	sb32p->f_bfree = (netbsd32_long)sbp->f_bfree;
 	sb32p->f_bavail = (netbsd32_long)sbp->f_bavail;
 	sb32p->f_files = (netbsd32_long)sbp->f_files;
 	sb32p->f_ffree = (netbsd32_long)sbp->f_ffree;
 	sb32p->f_fsid = sbp->f_fsidx;
 	sb32p->f_owner = sbp->f_owner;
 	sb32p->f_spare[0] = 0;
 	sb32p->f_spare[1] = 0;

--- src/sys/compat/netbsd32/netbsd32_compat_43.c 2020/01/21 18:12:54	1.54.8.1
+++ src/sys/compat/netbsd32/netbsd32_compat_43.c 2023/06/21 21:04:01	1.54.8.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_compat_43.c,v 1.54.8.1 2020/01/21 18:12:54 martin Exp $	*/
+/*	$NetBSD: netbsd32_compat_43.c,v 1.54.8.2 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.8.1 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.8.2 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/socket.h>
 @@ -634,26 +634,27 @@ compat_43_netbsd32_osigvec(struct lwp *l
 		nsa.sa_handler = NETBSD32PTR64(sv32.sv_handler);
 		nsa.sa_mask.__bits[0] = sv32.sv_mask;
 		nsa.sa_mask.__bits[1] = 0;
 		nsa.sa_mask.__bits[2] = 0;
 		nsa.sa_mask.__bits[3] = 0;
 		nsa.sa_flags = sv32.sv_flags ^ SA_RESTART;
 		error = sigaction1(l, SCARG(uap, signum), &nsa, &osa, NULL, 0);
 	} else
 		error = sigaction1(l, SCARG(uap, signum), NULL, &osa, NULL, 0);
 	if (error)
 		return error;
 	if (SCARG_P32(uap, osv)) {
 		memset(&sv32, 0, sizeof(sv32));
 		NETBSD32PTR32(sv32.sv_handler, osa.sa_handler);
 		sv32.sv_mask = osa.sa_mask.__bits[0];
 		sv32.sv_flags = osa.sa_flags ^ SA_RESTART;
 		error = copyout(&sv32, SCARG_P32(uap, osv), sizeof(sv32));
+	}
 	return error;
+}
 int
 compat_43_netbsd32_sigblock(struct lwp *l, const struct compat_43_netbsd32_sigblock_args *uap, register_t *retval)
+{
 	/* {
 @@ -692,20 +693,21 @@ compat_43_netbsd32_osigstack(struct lwp
 		error = copyin(SCARG_P32(uap, nss), &ss32, sizeof(ss32));
 		if (error)
 			return error;
 		nsa.ss_sp = NETBSD32PTR64(ss32.ss_sp);
 		nsa.ss_size = SIGSTKSZ; /* Use the recommended size */
 		nsa.ss_flags = ss32.ss_onstack ? SS_ONSTACK : 0;
 		error = sigaltstack1(l, &nsa, &osa);
 	} else
 		error = sigaltstack1(l, NULL, &osa);
 	if (error)
 		return error;
 	if (SCARG_P32(uap, oss)) {
 		memset(&ss32, 0, sizeof(ss32));
 		NETBSD32PTR32(ss32.ss_sp, osa.ss_sp);
 		ss32.ss_onstack = (osa.ss_flags & SS_ONSTACK) != 0;
 		error = copyout(&ss32, SCARG_P32(uap, oss), sizeof(ss32));
+	}
 	return error;
+}

--- src/sys/compat/netbsd32/netbsd32_compat_50.c 2020/01/21 18:12:54	1.32.10.1
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c 2023/06/21 21:04:01	1.32.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_compat_50.c,v 1.32.10.1 2020/01/21 18:12:54 martin Exp $	*/
+/*	$NetBSD: netbsd32_compat_50.c,v 1.32.10.2 2023/06/21 21:04:01 martin Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -26,27 +26,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.10.1 2020/01/21 18:12:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.10.2 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ktrace.h>
 @@ -153,26 +153,27 @@ compat_50_netbsd32_gettimeofday(struct l
 	if (SCARG_P32(uap, tp)) {
 		microtime(&atv);
 		netbsd32_from_timeval50(&atv, &tv32);
 		error = copyout(&tv32, SCARG_P32(uap, tp), sizeof(tv32));
 		if (error)
 			return error;
+	}
 	if (SCARG_P32(uap, tzp)) {
 		/*
 		 * NetBSD has no kernel notion of time zone, so we just
 		 * fake up a timezone struct and return it if demanded.
 		 */
 		memset(&tzfake, 0, sizeof(tzfake));
 		tzfake.tz_minuteswest = 0;
 		tzfake.tz_dsttime = 0;
 		error = copyout(&tzfake, SCARG_P32(uap, tzp), sizeof(tzfake));
+	}
 	return error;
+}
 int
 compat_50_netbsd32_settimeofday(struct lwp *l,
     const struct compat_50_netbsd32_settimeofday_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_timeval50p_t) tv;
 @@ -234,26 +235,28 @@ compat_50_netbsd32_adjtime(struct lwp *l
 	} */
 	struct netbsd32_timeval50 atv;
 	int error;
 	extern int time_adjusted;     /* in kern_ntptime.c */
 	extern int64_t time_adjtime;  /* in kern_ntptime.c */
 	if ((error = kauth_authorize_system(l->l_cred,
 	    KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
 	    NULL)) != 0)
 		return (error);
 	if (SCARG_P32(uap, olddelta)) {
 		memset(&atv, 0, sizeof(atv));
 		mutex_spin_enter(&timecounter_lock);
 		atv.tv_sec = time_adjtime / 1000000;
 		atv.tv_usec = time_adjtime % 1000000;
 		if (atv.tv_usec < 0) {
 			atv.tv_usec += 1000000;
 			atv.tv_sec--;
+		}
 		mutex_spin_exit(&timecounter_lock);
 		error = copyout(&atv, SCARG_P32(uap, olddelta), sizeof(atv));
 		if (error)
 			return (error);
+	}
 @@ -380,48 +383,51 @@ compat_50_netbsd32_timer_settime(struct
 	if ((error = copyin(SCARG_P32(uap, value), &its32, sizeof(its32))) != 0)
 		return (error);
 	netbsd32_to_timespec50(&its32.it_interval, &value.it_interval);
 	netbsd32_to_timespec50(&its32.it_value, &value.it_value);
 	if (SCARG_P32(uap, ovalue))
 		ovp = &ovalue;
 	if ((error = dotimer_settime(SCARG(uap, timerid), &value, ovp,
 	    SCARG(uap, flags), l->l_proc)) != 0)
 		return error;
 	if (ovp) {
 		memset(&its32, 0, sizeof(its32));
 		netbsd32_from_timespec50(&ovp->it_interval, &its32.it_interval);
 		netbsd32_from_timespec50(&ovp->it_value, &its32.it_value);
 		return copyout(&its32, SCARG_P32(uap, ovalue), sizeof(its32));
+	}
 	return 0;
+}
 int
 compat_50_netbsd32_timer_gettime(struct lwp *l, const struct compat_50_netbsd32_timer_gettime_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_timer_t) timerid;
 		syscallarg(netbsd32_itimerspec50p_t) value;
 	} */
 	int error;
 	struct itimerspec its;
 	struct netbsd32_itimerspec50 its32;
 	if ((error = dotimer_gettime(SCARG(uap, timerid), l->l_proc,
 	    &its)) != 0)
 		return error;
 	memset(&its32, 0, sizeof(its32));
 	netbsd32_from_timespec50(&its.it_interval, &its32.it_interval);
 	netbsd32_from_timespec50(&its.it_value, &its32.it_value);
 	return copyout(&its32, SCARG_P32(uap, value), sizeof(its32));
+}
 int
 compat_50_netbsd32_nanosleep(struct lwp *l,
     const struct compat_50_netbsd32_nanosleep_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_timespec50p_t) rqtp;
 		syscallarg(netbsd32_timespecp_t) rmtp;

--- src/sys/compat/netbsd32/netbsd32_conv.h 2023/06/21 20:38:35	1.31.8.4
+++ src/sys/compat/netbsd32/netbsd32_conv.h 2023/06/21 21:04:01	1.31.8.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_conv.h,v 1.31.8.4 2023/06/21 20:38:35 martin Exp $	*/
+/*	$NetBSD: netbsd32_conv.h,v 1.31.8.5 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -53,188 +53,203 @@
 #include <compat/sys/dirent.h>
 #include <prop/plistref.h>
 #include <compat/netbsd32/netbsd32.h>
 /* converters for structures that we need */
 static __inline void
 netbsd32_from_timeval50(const struct timeval *tv,
     struct netbsd32_timeval50 *tv32)
+{
 	memset(tv32, 0, sizeof(*tv32));
 	tv32->tv_sec = (netbsd32_time50_t)tv->tv_sec;
 	tv32->tv_usec = (netbsd32_long)tv->tv_usec;
+}
 static __inline void
 netbsd32_from_timeval(const struct timeval *tv,
     struct netbsd32_timeval *tv32)
+{
 	memset(tv32, 0, sizeof(*tv32));
 	tv32->tv_sec = (netbsd32_time_t)tv->tv_sec;
 	tv32->tv_usec = tv->tv_usec;
+}
 static __inline void
 netbsd32_to_timeval50(const struct netbsd32_timeval50 *tv32,
     struct timeval *tv)
+{
 	memset(tv, 0, sizeof(*tv));
 	tv->tv_sec = (time_t)tv32->tv_sec;
 	tv->tv_usec = tv32->tv_usec;
+}
 static __inline void
 netbsd32_to_timeval(const struct netbsd32_timeval *tv32,
     struct timeval *tv)
+{
 	memset(tv, 0, sizeof(*tv));
 	tv->tv_sec = (time_t)tv32->tv_sec;
 	tv->tv_usec = tv32->tv_usec;
+}
 static __inline void
 netbsd32_from_itimerval50(const struct itimerval *itv,
     struct netbsd32_itimerval50 *itv32)
+{
 	memset(itv32, 0, sizeof(*itv32));
 	netbsd32_from_timeval50(&itv->it_interval,
 			     &itv32->it_interval);
 	netbsd32_from_timeval50(&itv->it_value,
 			     &itv32->it_value);
+}
 static __inline void
 netbsd32_from_itimerval(const struct itimerval *itv,
     struct netbsd32_itimerval *itv32)
+{
 	memset(itv32, 0, sizeof(*itv32));
 	netbsd32_from_timeval(&itv->it_interval,
 			     &itv32->it_interval);
 	netbsd32_from_timeval(&itv->it_value,
 			     &itv32->it_value);
+}
 static __inline void
 netbsd32_to_itimerval50(const struct netbsd32_itimerval50 *itv32,
     struct itimerval *itv)
+{
 	memset(itv, 0, sizeof(*itv));
 	netbsd32_to_timeval50(&itv32->it_interval, &itv->it_interval);
 	netbsd32_to_timeval50(&itv32->it_value, &itv->it_value);
+}
 static __inline void
 netbsd32_to_itimerval(const struct netbsd32_itimerval *itv32,
     struct itimerval *itv)
+{
 	memset(itv, 0, sizeof(*itv));
 	netbsd32_to_timeval(&itv32->it_interval, &itv->it_interval);
 	netbsd32_to_timeval(&itv32->it_value, &itv->it_value);
+}
 static __inline void
 netbsd32_to_timespec50(const struct netbsd32_timespec50 *s32p,
     struct timespec *p)
+{
 	memset(p, 0, sizeof(*p));
 	p->tv_sec = (time_t)s32p->tv_sec;
 	p->tv_nsec = (long)s32p->tv_nsec;
+}
 static __inline void
 netbsd32_to_timespec(const struct netbsd32_timespec *s32p,
     struct timespec *p)
+{
 	memset(p, 0, sizeof(*p));
 	p->tv_sec = (time_t)s32p->tv_sec;
 	p->tv_nsec = (long)s32p->tv_nsec;
+}
 static __inline void
 netbsd32_from_timespec50(const struct timespec *p,
     struct netbsd32_timespec50 *s32p)
+{
 	memset(s32p, 0, sizeof(*s32p));
 	s32p->tv_sec = (netbsd32_time50_t)p->tv_sec;
 	s32p->tv_nsec = (netbsd32_long)p->tv_nsec;
+}
 static __inline void
 netbsd32_from_timespec(const struct timespec *p,
     struct netbsd32_timespec *s32p)
+{
 	memset(s32p, 0, sizeof(*s32p));
 	s32p->tv_sec = (netbsd32_time_t)p->tv_sec;
 	s32p->tv_nsec = (netbsd32_long)p->tv_nsec;
+}
 static __inline void
 netbsd32_from_rusage(const struct rusage *rup,
     struct netbsd32_rusage *ru32p)
+{
 	memset(ru32p, 0, sizeof(*ru32p));
 	netbsd32_from_timeval(&rup->ru_utime, &ru32p->ru_utime);
 	netbsd32_from_timeval(&rup->ru_stime, &ru32p->ru_stime);
 #define C(var)	ru32p->var = (netbsd32_long)rup->var
 	C(ru_maxrss);
 	C(ru_ixrss);
 	C(ru_idrss);
 	C(ru_isrss);
 	C(ru_minflt);
 	C(ru_majflt);
 	C(ru_nswap);
 	C(ru_inblock);
 	C(ru_oublock);
 	C(ru_msgsnd);
 	C(ru_msgrcv);
 	C(ru_nsignals);
 	C(ru_nvcsw);
 	C(ru_nivcsw);
 #undef C
+}
 static __inline void
 netbsd32_to_rusage(const struct netbsd32_rusage *ru32p,
     struct rusage *rup)
+{
 	memset(rup, 0, sizeof(*rup));
 	netbsd32_to_timeval(&ru32p->ru_utime, &rup->ru_utime);
 	netbsd32_to_timeval(&ru32p->ru_stime, &rup->ru_stime);
 #define C(var)	rup->var = (long)ru32p->var
 	C(ru_maxrss);
 	C(ru_ixrss);
 	C(ru_idrss);
 	C(ru_isrss);
 	C(ru_minflt);
 	C(ru_majflt);
 	C(ru_nswap);
 	C(ru_inblock);
 	C(ru_oublock);
 	C(ru_msgsnd);
 	C(ru_msgrcv);
 	C(ru_nsignals);
 	C(ru_nvcsw);
 	C(ru_nivcsw);
 #undef C
+}
 static __inline void
 netbsd32_from_rusage50(const struct rusage *rup,
     struct netbsd32_rusage50 *ru32p)
+{
 	memset(ru32p, 0, sizeof(*ru32p));
 	netbsd32_from_timeval50(&rup->ru_utime, &ru32p->ru_utime);
 	netbsd32_from_timeval50(&rup->ru_stime, &ru32p->ru_stime);
 #define C(var)	ru32p->var = (netbsd32_long)rup->var
 	C(ru_maxrss);
 	C(ru_ixrss);
 	C(ru_idrss);
 	C(ru_isrss);
 	C(ru_minflt);
 	C(ru_majflt);
 	C(ru_nswap);
 	C(ru_inblock);
 	C(ru_oublock);
 	C(ru_msgsnd);
 @@ -249,26 +264,27 @@ static __inline int
 netbsd32_to_iovecin(const struct netbsd32_iovec *iov32p, struct iovec *iovp,
     int len)
+{
 	int i, error=0;
 	u_int32_t iov_base;
 	u_int32_t iov_len, total_iov_len;
 	/*
 	 * We could allocate an iov32p, do a copyin, and translate
 	 * each field and then free it all up, or we could copyin
 	 * each field separately.  I'm doing the latter to reduce
 	 * the number of MALLOC()s.
 	 */
 	memset(iovp, 0, sizeof(*iovp));
 	total_iov_len = 0;
 	for (i = 0; i < len; i++, iovp++, iov32p++) {
 		if ((error = copyin(&iov32p->iov_base, &iov_base, sizeof(iov_base))))
 		    return (error);
 		if ((error = copyin(&iov32p->iov_len, &iov_len, sizeof(iov_len))))
 		    return (error);
 		iovp->iov_base = (void *)(u_long)iov_base;
 		iovp->iov_len = (size_t)iov_len;
 		/*
 		 * System calls return ssize_t because -1 is returned
 		 * on error.  Therefore we must restrict the length to
 		 * SSIZE_MAX (NETBSD32_SSIZE_MAX with compat32) to
 @@ -279,50 +295,54 @@ netbsd32_to_iovecin(const struct netbsd3
 		    total_iov_len > NETBSD32_SSIZE_MAX) {
 			return EINVAL;
 			break;
+		}
+	}
 	return error;
+}
 /* msg_iov must be done separately */
 static __inline void
 netbsd32_to_msghdr(const struct netbsd32_msghdr *mhp32, struct msghdr *mhp)
+{
 	memset(mhp, 0, sizeof(*mhp));
 	mhp->msg_name = NETBSD32PTR64(mhp32->msg_name);
 	mhp->msg_namelen = mhp32->msg_namelen;
 	mhp->msg_iovlen = (size_t)mhp32->msg_iovlen;
 	mhp->msg_control = NETBSD32PTR64(mhp32->msg_control);
 	mhp->msg_controllen = mhp32->msg_controllen;
 	mhp->msg_flags = mhp32->msg_flags;
+}
 /* msg_iov must be done separately */
 static __inline void
 netbsd32_from_msghdr(struct netbsd32_msghdr *mhp32, const struct msghdr *mhp)
+{
 	memset(mhp32, 0, sizeof(*mhp32));
 	NETBSD32PTR32(mhp32->msg_name, mhp->msg_name);
 	mhp32->msg_namelen = mhp->msg_namelen;
 	mhp32->msg_iovlen = mhp->msg_iovlen;
 	NETBSD32PTR32(mhp32->msg_control, mhp->msg_control);
 	mhp32->msg_controllen = mhp->msg_controllen;
 	mhp32->msg_flags = mhp->msg_flags;
+}
 static __inline void
 netbsd32_from_statvfs(const struct statvfs *sbp, struct netbsd32_statvfs *sb32p)
+{
 	memset(sb32p, 0, sizeof(*sb32p));
 	sb32p->f_flag = sbp->f_flag;
 	sb32p->f_bsize = (netbsd32_u_long)sbp->f_bsize;
 	sb32p->f_frsize = (netbsd32_u_long)sbp->f_frsize;
 	sb32p->f_iosize = (netbsd32_u_long)sbp->f_iosize;
 	sb32p->f_blocks = sbp->f_blocks;
 	sb32p->f_bfree = sbp->f_bfree;
 	sb32p->f_bavail = sbp->f_bavail;
 	sb32p->f_bresvd = sbp->f_bresvd;
 	sb32p->f_files = sbp->f_files;
 	sb32p->f_ffree = sbp->f_ffree;
 	sb32p->f_favail = sbp->f_favail;
 	sb32p->f_fresvd = sbp->f_fresvd;
 	sb32p->f_syncreads = sbp->f_syncreads;
 @@ -344,123 +364,128 @@ netbsd32_from_statvfs(const struct statv
 	    sizeof(sb32p->f_mntfromname));
 #else
 	/* If we want to be careful */
 	memcpy(sb32p->f_fstypename, sbp->f_fstypename, sizeof(sb32p->f_fstypename));
 	memcpy(sb32p->f_mntonname, sbp->f_mntonname, sizeof(sb32p->f_mntonname));
 	memcpy(sb32p->f_mntfromname, sbp->f_mntfromname, sizeof(sb32p->f_mntfromname));
 #endif
+}
 static __inline void
 netbsd32_from_timex(const struct timex *txp, struct netbsd32_timex *tx32p)
+{
 	memset(tx32p, 0, sizeof(*tx32p));
 	tx32p->modes = txp->modes;
 	tx32p->offset = (netbsd32_long)txp->offset;
 	tx32p->freq = (netbsd32_long)txp->freq;
 	tx32p->maxerror = (netbsd32_long)txp->maxerror;
 	tx32p->esterror = (netbsd32_long)txp->esterror;
 	tx32p->status = txp->status;
 	tx32p->constant = (netbsd32_long)txp->constant;
 	tx32p->precision = (netbsd32_long)txp->precision;
 	tx32p->tolerance = (netbsd32_long)txp->tolerance;
 	tx32p->ppsfreq = (netbsd32_long)txp->ppsfreq;
 	tx32p->jitter = (netbsd32_long)txp->jitter;
 	tx32p->shift = txp->shift;
 	tx32p->stabil = (netbsd32_long)txp->stabil;
 	tx32p->jitcnt = (netbsd32_long)txp->jitcnt;
 	tx32p->calcnt = (netbsd32_long)txp->calcnt;
 	tx32p->errcnt = (netbsd32_long)txp->errcnt;
 	tx32p->stbcnt = (netbsd32_long)txp->stbcnt;
+}
 static __inline void
 netbsd32_to_timex(const struct netbsd32_timex *tx32p, struct timex *txp)
+{
 	memset(txp, 0, sizeof(*txp));
 	txp->modes = tx32p->modes;
 	txp->offset = (long)tx32p->offset;
 	txp->freq = (long)tx32p->freq;
 	txp->maxerror = (long)tx32p->maxerror;
 	txp->esterror = (long)tx32p->esterror;
 	txp->status = tx32p->status;
 	txp->constant = (long)tx32p->constant;
 	txp->precision = (long)tx32p->precision;
 	txp->tolerance = (long)tx32p->tolerance;
 	txp->ppsfreq = (long)tx32p->ppsfreq;
 	txp->jitter = (long)tx32p->jitter;
 	txp->shift = tx32p->shift;
 	txp->stabil = (long)tx32p->stabil;
 	txp->jitcnt = (long)tx32p->jitcnt;
 	txp->calcnt = (long)tx32p->calcnt;
 	txp->errcnt = (long)tx32p->errcnt;
 	txp->stbcnt = (long)tx32p->stbcnt;
+}
 static __inline void
 netbsd32_from___stat13(const struct stat *sbp, struct netbsd32_stat13 *sb32p)
+{
 	memset(sb32p, 0, sizeof *sb32p);
 	sb32p->st_dev = (uint32_t)sbp->st_dev;
 	sb32p->st_ino = sbp->st_ino;
 	sb32p->st_mode = sbp->st_mode;
 	sb32p->st_nlink = sbp->st_nlink;
 	sb32p->st_uid = sbp->st_uid;
 	sb32p->st_gid = sbp->st_gid;
 	sb32p->st_rdev = (uint32_t)sbp->st_rdev;
 	sb32p->st_size = sbp->st_size;
 	sb32p->st_atimespec.tv_sec = (int32_t)sbp->st_atimespec.tv_sec;
 	sb32p->st_atimespec.tv_nsec = (netbsd32_long)sbp->st_atimespec.tv_nsec;
 	sb32p->st_mtimespec.tv_sec = (int32_t)sbp->st_mtimespec.tv_sec;
 	sb32p->st_mtimespec.tv_nsec = (netbsd32_long)sbp->st_mtimespec.tv_nsec;
 	sb32p->st_ctimespec.tv_sec = (int32_t)sbp->st_ctimespec.tv_sec;
 	sb32p->st_ctimespec.tv_nsec = (netbsd32_long)sbp->st_ctimespec.tv_nsec;
 	sb32p->st_blksize = sbp->st_blksize;
 	sb32p->st_blocks = sbp->st_blocks;
 	sb32p->st_flags = sbp->st_flags;
 	sb32p->st_gen = sbp->st_gen;
 	sb32p->st_birthtimespec.tv_sec = (int32_t)sbp->st_birthtimespec.tv_sec;
 	sb32p->st_birthtimespec.tv_nsec = (netbsd32_long)sbp->st_birthtimespec.tv_nsec;
+}
 static __inline void
 netbsd32_from___stat50(const struct stat *sbp, struct netbsd32_stat50 *sb32p)
+{
 	memset(sb32p, 0, sizeof *sb32p);
 	sb32p->st_dev = (uint32_t)sbp->st_dev;
 	sb32p->st_ino = sbp->st_ino;
 	sb32p->st_mode = sbp->st_mode;
 	sb32p->st_nlink = sbp->st_nlink;
 	sb32p->st_uid = sbp->st_uid;
 	sb32p->st_gid = sbp->st_gid;
 	sb32p->st_rdev = (uint32_t)sbp->st_rdev;
 	sb32p->st_size = sbp->st_size;
 	sb32p->st_atimespec.tv_sec = (int32_t)sbp->st_atimespec.tv_sec;
 	sb32p->st_atimespec.tv_nsec = (netbsd32_long)sbp->st_atimespec.tv_nsec;
 	sb32p->st_mtimespec.tv_sec = (int32_t)sbp->st_mtimespec.tv_sec;
 	sb32p->st_mtimespec.tv_nsec = (netbsd32_long)sbp->st_mtimespec.tv_nsec;
 	sb32p->st_ctimespec.tv_sec = (int32_t)sbp->st_ctimespec.tv_sec;
 	sb32p->st_ctimespec.tv_nsec = (netbsd32_long)sbp->st_ctimespec.tv_nsec;
 	sb32p->st_birthtimespec.tv_sec = (int32_t)sbp->st_birthtimespec.tv_sec;
 	sb32p->st_birthtimespec.tv_nsec = (netbsd32_long)sbp->st_birthtimespec.tv_nsec;
 	sb32p->st_blksize = sbp->st_blksize;
 	sb32p->st_blocks = sbp->st_blocks;
 	sb32p->st_flags = sbp->st_flags;
 	sb32p->st_gen = sbp->st_gen;
+}
 static __inline void
 netbsd32_from_stat(const struct stat *sbp, struct netbsd32_stat *sb32p)
+{
 	memset(sb32p, 0, sizeof *sb32p);
 	sb32p->st_dev = sbp->st_dev;
 	sb32p->st_ino = sbp->st_ino;
 	sb32p->st_mode = sbp->st_mode;
 	sb32p->st_nlink = sbp->st_nlink;
 	sb32p->st_uid = sbp->st_uid;
 	sb32p->st_gid = sbp->st_gid;
 	sb32p->st_rdev = sbp->st_rdev;
 	sb32p->st_size = sbp->st_size;
 	sb32p->st_atimespec.tv_sec = (netbsd32_time_t)sbp->st_atimespec.tv_sec;
 	sb32p->st_atimespec.tv_nsec = (netbsd32_long)sbp->st_atimespec.tv_nsec;
 	sb32p->st_mtimespec.tv_sec = (netbsd32_time_t)sbp->st_mtimespec.tv_sec;
 	sb32p->st_mtimespec.tv_nsec = (netbsd32_long)sbp->st_mtimespec.tv_nsec;
 @@ -469,26 +494,27 @@ netbsd32_from_stat(const struct stat *sb
 	sb32p->st_birthtimespec.tv_sec = (netbsd32_time_t)sbp->st_birthtimespec.tv_sec;
 	sb32p->st_birthtimespec.tv_nsec = (netbsd32_long)sbp->st_birthtimespec.tv_nsec;
 	sb32p->st_blksize = sbp->st_blksize;
 	sb32p->st_blocks = sbp->st_blocks;
 	sb32p->st_flags = sbp->st_flags;
 	sb32p->st_gen = sbp->st_gen;
+}
 static __inline void
 netbsd32_to_ipc_perm(const struct netbsd32_ipc_perm *ip32p,
     struct ipc_perm *ipp)
+{
 	memset(ipp, 0, sizeof(*ipp));
 	ipp->cuid = ip32p->cuid;
 	ipp->cgid = ip32p->cgid;
 	ipp->uid = ip32p->uid;
 	ipp->gid = ip32p->gid;
 	ipp->mode = ip32p->mode;
 	ipp->_seq = ip32p->_seq;
 	ipp->_key = (key_t)ip32p->_key;
+}
 static __inline void
 netbsd32_from_ipc_perm(const struct ipc_perm *ipp,
     struct netbsd32_ipc_perm *ip32p)
+{
 @@ -497,64 +523,67 @@ netbsd32_from_ipc_perm(const struct ipc_
 	ip32p->cuid = ipp->cuid;
 	ip32p->cgid = ipp->cgid;
 	ip32p->uid = ipp->uid;
 	ip32p->gid = ipp->gid;
 	ip32p->mode = ipp->mode;
 	ip32p->_seq = ipp->_seq;
 	ip32p->_key = (netbsd32_key_t)ipp->_key;
+}
 static __inline void
 netbsd32_to_msg(const struct netbsd32_msg *m32p, struct msg *mp)
+{
 	memset(mp, 0, sizeof(*mp));
 	mp->msg_next = NETBSD32PTR64(m32p->msg_next);
 	mp->msg_type = (long)m32p->msg_type;
 	mp->msg_ts = m32p->msg_ts;
 	mp->msg_spot = m32p->msg_spot;
+}
 static __inline void
 netbsd32_from_msg(const struct msg *mp, struct netbsd32_msg *m32p)
+{
 	memset(m32p, 0, sizeof *m32p);
 	NETBSD32PTR32(m32p->msg_next, mp->msg_next);
 	m32p->msg_type = (netbsd32_long)mp->msg_type;
 	m32p->msg_ts = mp->msg_ts;
 	m32p->msg_spot = mp->msg_spot;
+}
 static __inline void
 netbsd32_to_msqid_ds50(const struct netbsd32_msqid_ds50 *ds32p,
     struct msqid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&ds32p->msg_perm, &dsp->msg_perm);
 	dsp->_msg_cbytes = (u_long)ds32p->_msg_cbytes;
 	dsp->msg_qnum = (u_long)ds32p->msg_qnum;
 	dsp->msg_qbytes = (u_long)ds32p->msg_qbytes;
 	dsp->msg_lspid = ds32p->msg_lspid;
 	dsp->msg_lrpid = ds32p->msg_lrpid;
 	dsp->msg_rtime = (time_t)ds32p->msg_rtime;
 	dsp->msg_stime = (time_t)ds32p->msg_stime;
 	dsp->msg_ctime = (time_t)ds32p->msg_ctime;
+}
 static __inline void
 netbsd32_to_msqid_ds(const struct netbsd32_msqid_ds *ds32p,
     struct msqid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&ds32p->msg_perm, &dsp->msg_perm);
 	dsp->_msg_cbytes = (u_long)ds32p->_msg_cbytes;
 	dsp->msg_qnum = (u_long)ds32p->msg_qnum;
 	dsp->msg_qbytes = (u_long)ds32p->msg_qbytes;
 	dsp->msg_lspid = ds32p->msg_lspid;
 	dsp->msg_lrpid = ds32p->msg_lrpid;
 	dsp->msg_rtime = (time_t)ds32p->msg_rtime;
 	dsp->msg_stime = (time_t)ds32p->msg_stime;
 	dsp->msg_ctime = (time_t)ds32p->msg_ctime;
+}
 static __inline void
 netbsd32_from_msqid_ds50(const struct msqid_ds *dsp,
 @@ -585,41 +614,43 @@ netbsd32_from_msqid_ds(const struct msqi
 	ds32p->msg_qbytes = (netbsd32_u_long)dsp->msg_qbytes;
 	ds32p->msg_lspid = dsp->msg_lspid;
 	ds32p->msg_lrpid = dsp->msg_lrpid;
 	ds32p->msg_rtime = dsp->msg_rtime;
 	ds32p->msg_stime = dsp->msg_stime;
 	ds32p->msg_ctime = dsp->msg_ctime;
+}
 static __inline void
 netbsd32_to_shmid_ds50(const struct netbsd32_shmid_ds50 *ds32p,
     struct shmid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&ds32p->shm_perm, &dsp->shm_perm);
 	dsp->shm_segsz = ds32p->shm_segsz;
 	dsp->shm_lpid = ds32p->shm_lpid;
 	dsp->shm_cpid = ds32p->shm_cpid;
 	dsp->shm_nattch = ds32p->shm_nattch;
 	dsp->shm_atime = (time_t)ds32p->shm_atime;
 	dsp->shm_dtime = (time_t)ds32p->shm_dtime;
 	dsp->shm_ctime = (time_t)ds32p->shm_ctime;
+}
 static __inline void
 netbsd32_to_shmid_ds(const struct netbsd32_shmid_ds *ds32p,
     struct shmid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&ds32p->shm_perm, &dsp->shm_perm);
 	dsp->shm_segsz = ds32p->shm_segsz;
 	dsp->shm_lpid = ds32p->shm_lpid;
 	dsp->shm_cpid = ds32p->shm_cpid;
 	dsp->shm_nattch = ds32p->shm_nattch;
 	dsp->shm_atime = (long)ds32p->shm_atime;
 	dsp->shm_dtime = (time_t)ds32p->shm_dtime;
 	dsp->shm_ctime = (time_t)ds32p->shm_ctime;
+}
 static __inline void
 netbsd32_from_shmid_ds50(const struct shmid_ds *dsp,
     struct netbsd32_shmid_ds50 *ds32p)
 @@ -647,37 +678,39 @@ netbsd32_from_shmid_ds(const struct shmi
 	ds32p->shm_lpid = dsp->shm_lpid;
 	ds32p->shm_cpid = dsp->shm_cpid;
 	ds32p->shm_nattch = dsp->shm_nattch;
 	ds32p->shm_atime = (netbsd32_long)dsp->shm_atime;
 	ds32p->shm_dtime = (netbsd32_long)dsp->shm_dtime;
 	ds32p->shm_ctime = (netbsd32_long)dsp->shm_ctime;
+}
 static __inline void
 netbsd32_to_semid_ds50(const struct netbsd32_semid_ds50 *s32dsp,
     struct semid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&s32dsp->sem_perm, &dsp->sem_perm);
 	dsp->sem_nsems = (time_t)s32dsp->sem_nsems;
 	dsp->sem_otime = (time_t)s32dsp->sem_otime;
 	dsp->sem_ctime = (time_t)s32dsp->sem_ctime;
+}
 static __inline void
 netbsd32_to_semid_ds(const struct netbsd32_semid_ds *s32dsp,
     struct semid_ds *dsp)
+{
 	memset(dsp, 0, sizeof(*dsp));
 	netbsd32_to_ipc_perm(&s32dsp->sem_perm, &dsp->sem_perm);
 	dsp->sem_nsems = s32dsp->sem_nsems;
 	dsp->sem_otime = s32dsp->sem_otime;
 	dsp->sem_ctime = s32dsp->sem_ctime;
+}
 static __inline void
 netbsd32_from_semid_ds50(const struct semid_ds *dsp,
     struct netbsd32_semid_ds50 *s32dsp)
+{
 	memset(s32dsp, 0, sizeof *s32dsp);
 	netbsd32_from_ipc_perm(&dsp->sem_perm, &s32dsp->sem_perm);
 @@ -693,57 +726,64 @@ netbsd32_from_semid_ds(const struct semi
 	memset(s32dsp, 0, sizeof *s32dsp);
 	netbsd32_from_ipc_perm(&dsp->sem_perm, &s32dsp->sem_perm);
 	s32dsp->sem_nsems = dsp->sem_nsems;
 	s32dsp->sem_otime = dsp->sem_otime;
 	s32dsp->sem_ctime = dsp->sem_ctime;
+}
 static __inline void
 netbsd32_from_loadavg(struct netbsd32_loadavg *av32,
     const struct loadavg *av)
+{
 	memset(av32, 0, sizeof(*av32));
 	av32->ldavg[0] = av->ldavg[0];
 	av32->ldavg[1] = av->ldavg[1];
 	av32->ldavg[2] = av->ldavg[2];
 	av32->fscale = (netbsd32_long)av->fscale;
+}
 static __inline void
 netbsd32_to_kevent(struct netbsd32_kevent *ke32, struct kevent *ke)
+{
 	memset(ke, 0, sizeof(*ke));
 	ke->ident = ke32->ident;
 	ke->filter = ke32->filter;
 	ke->flags = ke32->flags;
 	ke->fflags = ke32->fflags;
 	ke->data = ke32->data;
 	ke->udata = ke32->udata;
+}
 static __inline void
 netbsd32_from_kevent(struct kevent *ke, struct netbsd32_kevent *ke32)
+{
 	memset(ke32, 0, sizeof(*ke32));
 	ke32->ident = ke->ident;
 	ke32->filter = ke->filter;
 	ke32->flags = ke->flags;
 	ke32->fflags = ke->fflags;
 	ke32->data = ke->data;
 	ke32->udata = ke->udata;
+}
 static __inline void
 netbsd32_to_sigevent(const struct netbsd32_sigevent *ev32, struct sigevent *ev)
+{
 	memset(ev, 0, sizeof(*ev));
 	ev->sigev_notify = ev32->sigev_notify;
 	ev->sigev_signo = ev32->sigev_signo;
 	/*
 	 * XXX sival_ptr, sigev_notify_function and
 	 *     sigev_notify_attributes are  currently unused
 	 */
 	ev->sigev_value.sival_int = ev32->sigev_value.sival_int;
 	ev->sigev_notify_function = NETBSD32PTR64(ev32->sigev_notify_function);
 	ev->sigev_notify_attributes = NETBSD32PTR64(ev32->sigev_notify_attributes);
+}
 static __inline int
 netbsd32_to_dirent12(char *buf, int nbytes)
 @@ -786,40 +826,45 @@ netbsd32_copyin_plistref(netbsd32_pointe
 	    sizeof(struct netbsd32_plistref));
 	if (error)
 		return error;
 	p->pref_plist = NETBSD32PTR64(n32plist.pref_plist);
 	p->pref_len = n32plist.pref_len;
 	return 0;
+}
 static inline int
 netbsd32_copyout_plistref(netbsd32_pointer_t n32p, struct plistref *p)
+{
 	struct netbsd32_plistref n32plist;
 	memset(&n32plist, 0, sizeof(n32plist));
 	NETBSD32PTR32(n32plist.pref_plist, p->pref_plist);
 	n32plist.pref_len = p->pref_len;
 	return copyout(&n32plist, NETBSD32PTR64(n32p),
 	    sizeof(struct netbsd32_plistref));
+}
 static __inline void
 netbsd32_to_mq_attr(const struct netbsd32_mq_attr *a32,
     struct mq_attr *attr)
+{
 	memset(attr, 0, sizeof(*attr));
 	attr->mq_flags = a32->mq_flags;
 	attr->mq_maxmsg = a32->mq_maxmsg;
 	attr->mq_msgsize = a32->mq_msgsize;
 	attr->mq_curmsgs = a32->mq_curmsgs;
+}
 static __inline void
 netbsd32_from_mq_attr(const struct mq_attr *attr,
 	struct netbsd32_mq_attr *a32)
+{
 	memset(a32, 0, sizeof(*a32));
 	a32->mq_flags = attr->mq_flags;
 	a32->mq_maxmsg = attr->mq_maxmsg;
 	a32->mq_msgsize = attr->mq_msgsize;
 	a32->mq_curmsgs = attr->mq_curmsgs;
+}
 #endif /* _COMPAT_NETBSD32_NETBSD32_CONV_H_ */

--- src/sys/compat/netbsd32/netbsd32_nfssvc.c 2016/10/15 06:50:13	1.5
+++ src/sys/compat/netbsd32/netbsd32_nfssvc.c 2023/06/21 21:04:01	1.5.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_nfssvc.c,v 1.5 2016/10/15 06:50:13 skrll Exp $	*/
+/*	$NetBSD: netbsd32_nfssvc.c,v 1.5.8.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 2015 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.5 2016/10/15 06:50:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_nfssvc.c,v 1.5.8.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_nfs.h"
 #include "opt_nfsserver.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <sys/filedesc.h>
 #include <sys/module.h>
 #include <sys/syscallvar.h>
 @@ -113,26 +113,27 @@ nfssvc32_nsd_in(struct nfsd_srvargs *nsd
 		nsd->nsd_ttl = args32.nsd_ttl;
 		nsd->nsd_key[0] = args32.nsd_key[0];
 		nsd->nsd_key[1] = args32.nsd_key[1];
+	}
 	return error;
+}
 static int
 nfssvc32_nsd_out(void *argp, const struct nfsd_srvargs *nsd)
+{
 	struct netbsd32_nfsd_srvargs args32;
 	memset(&args32, 0, sizeof(args32));
 	NETBSD32PTR32(args32.nsd_nfsd, nsd->nsd_nfsd);
 	args32.nsd_uid = nsd->nsd_uid;
 	args32.nsd_haddr = nsd->nsd_haddr;
 	args32.nsd_cr = nsd->nsd_cr;
 	args32.nsd_authlen = nsd->nsd_authlen;
 	NETBSD32PTR32(args32.nsd_authstr, nsd->nsd_authstr);
 	args32.nsd_verflen = nsd->nsd_verflen;
 	args32.nsd_uid = nsd->nsd_uid;
 	netbsd32_from_timeval(&nsd->nsd_timestamp, &args32.nsd_timestamp);
 	args32.nsd_ttl = nsd->nsd_ttl;
 	args32.nsd_key[0] = nsd->nsd_key[0];
 	args32.nsd_key[1] = nsd->nsd_key[1];

--- src/sys/compat/netbsd32/netbsd32_ptrace.c 2018/04/12 13:42:49	1.4.6.1
+++ src/sys/compat/netbsd32/netbsd32_ptrace.c 2023/06/21 21:04:01	1.4.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_ptrace.c,v 1.4.6.1 2018/04/12 13:42:49 martin Exp $	*/
+/*	$NetBSD: netbsd32_ptrace.c,v 1.4.6.2 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ptrace.c,v 1.4.6.1 2018/04/12 13:42:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ptrace.c,v 1.4.6.2 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ptrace.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/ptrace.h>
 #include <sys/syscallvar.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscall.h>
 @@ -71,26 +71,27 @@ netbsd32_copyin_piod(struct ptrace_io_de
 	piod->piod_len = (size_t)piod32.piod_len;
 	return 0;
+}
 static int
 netbsd32_copyout_piod(const struct ptrace_io_desc *piod, void *addr, size_t len)
+{
 	struct netbsd32_ptrace_io_desc piod32;
 	if (len != 0 && sizeof(piod32) != len)
 		return EINVAL;
 	memset(&piod32, 0, sizeof(piod32));
 	piod32.piod_op = piod->piod_op;
 	NETBSD32PTR32(piod32.piod_offs, piod->piod_offs);
 	NETBSD32PTR32(piod32.piod_addr, piod->piod_addr);
 	piod32.piod_len = (netbsd32_size_t)piod->piod_len;
 	return copyout(&piod32, addr, sizeof(piod32));
+}
 static int
 netbsd32_copyin_siginfo(struct ptrace_siginfo *psi, const void *addr, size_t len)
+{
 	struct netbsd32_ptrace_siginfo psi32;
 	if (sizeof(psi32) != len)
 @@ -102,26 +103,27 @@ netbsd32_copyin_siginfo(struct ptrace_si
 	psi->psi_lwpid = psi32.psi_lwpid;
 	netbsd32_si32_to_si(&psi->psi_siginfo, &psi32.psi_siginfo);
 	return 0;
+}
 static int
 netbsd32_copyout_siginfo(const struct ptrace_siginfo *psi, void *addr, size_t len)
+{
 	struct netbsd32_ptrace_siginfo psi32;
 	if (sizeof(psi32) != len)
 		return EINVAL;
 	memset(&psi32, 0, sizeof(psi32));
 	psi32.psi_lwpid = psi->psi_lwpid;
 	netbsd32_si_to_si32(&psi32.psi_siginfo, &psi->psi_siginfo);
 	return copyout(&psi32, addr, sizeof(psi32));
+}
 static int
 netbsd32_doregs(struct lwp *curl /*tracer*/,
     struct lwp *l /*traced*/,
     struct uio *uio)
+{
 #if defined(PT_GETREGS) || defined(PT_SETREGS)
 	process_reg32 r32;
 	int error;

--- src/sys/compat/netbsd32/netbsd32_signal.c 2018/04/12 13:42:49	1.43.8.1
+++ src/sys/compat/netbsd32/netbsd32_signal.c 2023/06/21 21:04:01	1.43.8.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_signal.c,v 1.43.8.1 2018/04/12 13:42:49 martin Exp $	*/
+/*	$NetBSD: netbsd32_signal.c,v 1.43.8.2 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.43.8.1 2018/04/12 13:42:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.43.8.2 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/signalvar.h>
 #include <sys/ktrace.h>
 #include <sys/proc.h>
 @@ -76,26 +76,27 @@ netbsd32_sigaction(struct lwp *l, const
 		memset(&nsa.sa_mask, 0, sizeof(nsa.sa_mask));
 		nsa.sa_mask.__bits[0] = sa32.netbsd32_sa_mask;
 		nsa.sa_flags = sa32.netbsd32_sa_flags;
+	}
 	error = sigaction1(l, SCARG(uap, signum),
 			   SCARG_P32(uap, nsa) ? &nsa : 0,
 			   SCARG_P32(uap, osa) ? &osa : 0,
 			   NULL, 0);
 	if (error)
 		return (error);
 	if (SCARG_P32(uap, osa)) {
 		memset(&sa32, 0, sizeof(sa32));
 		NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
 		sa32.netbsd32_sa_mask = osa.sa_mask.__bits[0];
 		sa32.netbsd32_sa_flags = osa.sa_flags;
 		sa32p = SCARG_P32(uap, osa);
 		if (copyout(&sa32, sa32p, sizeof(sa32)))
 			return EFAULT;
+	}
 	return (0);
+}
 int
 netbsd32___sigaltstack14(struct lwp *l, const struct netbsd32___sigaltstack14_args *uap, register_t *retval)
 @@ -125,26 +126,27 @@ netbsd32___sigaction14(struct lwp *l, co
 		if (error)
 			return (error);
 		nsa.sa_handler = NETBSD32PTR64(sa32.netbsd32_sa_handler);
 		nsa.sa_mask = sa32.netbsd32_sa_mask;
 		nsa.sa_flags = sa32.netbsd32_sa_flags;
+	}
 	error = sigaction1(l, SCARG(uap, signum),
 		    SCARG_P32(uap, nsa) ? &nsa : 0,
 		    SCARG_P32(uap, osa) ? &osa : 0,
 		    NULL, 0);
 	if (error)
 		return (error);
 	if (SCARG_P32(uap, osa)) {
 		memset(&sa32, 0, sizeof(sa32));
 		NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
 		sa32.netbsd32_sa_mask = osa.sa_mask;
 		sa32.netbsd32_sa_flags = osa.sa_flags;
 		error = copyout(&sa32, SCARG_P32(uap, osa), sizeof(sa32));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 /* ARGSUSED */
 int
 netbsd32___sigaction_sigtramp(struct lwp *l, const struct netbsd32___sigaction_sigtramp_args *uap, register_t *retval)
 @@ -165,26 +167,27 @@ netbsd32___sigaction_sigtramp(struct lwp
 		if (error)
 			return (error);
 		nsa.sa_handler = NETBSD32PTR64(sa32.netbsd32_sa_handler);
 		nsa.sa_mask = sa32.netbsd32_sa_mask;
 		nsa.sa_flags = sa32.netbsd32_sa_flags;
+	}
 	error = sigaction1(l, SCARG(uap, signum),
 	    SCARG_P32(uap, nsa) ? &nsa : 0,
 	    SCARG_P32(uap, osa) ? &osa : 0,
 	    SCARG_P32(uap, tramp), SCARG(uap, vers));
 	if (error)
 		return (error);
 	if (SCARG_P32(uap, osa)) {
 		memset(&sa32, 0, sizeof(sa32));
 		NETBSD32PTR32(sa32.netbsd32_sa_handler, osa.sa_handler);
 		sa32.netbsd32_sa_mask = osa.sa_mask;
 		sa32.netbsd32_sa_flags = osa.sa_flags;
 		error = copyout(&sa32, SCARG_P32(uap, osa), sizeof(sa32));
 		if (error)
 			return (error);
+	}
 	return (0);
+}
 void
 netbsd32_ksi32_to_ksi(struct _ksiginfo *si, const struct __ksiginfo32 *si32)
+{

--- src/sys/compat/netbsd32/netbsd32_time.c 2017/02/26 10:26:19	1.49
+++ src/sys/compat/netbsd32/netbsd32_time.c 2023/06/21 21:04:01	1.49.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_time.c,v 1.49 2017/02/26 10:26:19 njoly Exp $	*/
+/*	$NetBSD: netbsd32_time.c,v 1.49.6.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49 2017/02/26 10:26:19 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49.6.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <sys/timevar.h>
 #include <sys/proc.h>
 @@ -247,26 +247,27 @@ netbsd32___gettimeofday50(struct lwp *l,
 	if (SCARG_P32(uap, tp)) {
 		microtime(&atv);
 		netbsd32_from_timeval(&atv, &tv32);
 		error = copyout(&tv32, SCARG_P32(uap, tp), sizeof(tv32));
 		if (error)
 			return (error);
+	}
 	if (SCARG_P32(uap, tzp)) {
 		/*
 		 * NetBSD has no kernel notion of time zone, so we just
 		 * fake up a timezone struct and return it if demanded.
 		 */
 		memset(&tzfake, 0, sizeof(tzfake));
 		tzfake.tz_minuteswest = 0;
 		tzfake.tz_dsttime = 0;
 		error = copyout(&tzfake, SCARG_P32(uap, tzp), sizeof(tzfake));
+	}
 	return (error);
+}
 int
 netbsd32___settimeofday50(struct lwp *l, const struct netbsd32___settimeofday50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_timevalp_t) tv;
 		syscallarg(const netbsd32_timezonep_t) tzp;
 @@ -307,26 +308,27 @@ netbsd32___adjtime50(struct lwp *l, cons
 	} */
 	struct netbsd32_timeval atv;
 	int error;
 	extern int time_adjusted;     /* in kern_ntptime.c */
 	extern int64_t time_adjtime;  /* in kern_ntptime.c */
 	if ((error = kauth_authorize_system(l->l_cred,
 	    KAUTH_SYSTEM_TIME, KAUTH_REQ_SYSTEM_TIME_ADJTIME, NULL, NULL,
 	    NULL)) != 0)
 		return (error);
 	if (SCARG_P32(uap, olddelta)) {
 		memset(&atv, 0, sizeof(atv));
 		atv.tv_sec = time_adjtime / 1000000;
 		atv.tv_usec = time_adjtime % 1000000;
 		if (atv.tv_usec < 0) {
 			atv.tv_usec += 1000000;
 			atv.tv_sec--;
+		}
 		error = copyout(&atv, SCARG_P32(uap, olddelta), sizeof(atv));
 		if (error)
 			return (error);
+	}
 	if (SCARG_P32(uap, delta)) {
 		error = copyin(SCARG_P32(uap, delta), &atv, sizeof(atv));
 @@ -518,48 +520,50 @@ netbsd32___timer_settime50(struct lwp *l
 	if ((error = copyin(SCARG_P32(uap, value), &its32, sizeof(its32))) != 0)
 		return (error);
 	netbsd32_to_timespec(&its32.it_interval, &value.it_interval);
 	netbsd32_to_timespec(&its32.it_value, &value.it_value);
 	if (SCARG_P32(uap, ovalue))
 		ovp = &ovalue;
 	if ((error = dotimer_settime(SCARG(uap, timerid), &value, ovp,
 	    SCARG(uap, flags), l->l_proc)) != 0)
 		return error;
 	if (ovp) {
 		memset(&its32, 0, sizeof(its32));
 		netbsd32_from_timespec(&ovp->it_interval, &its32.it_interval);
 		netbsd32_from_timespec(&ovp->it_value, &its32.it_value);
 		return copyout(&its32, SCARG_P32(uap, ovalue), sizeof(its32));
+	}
 	return 0;
+}
 int
 netbsd32___timer_gettime50(struct lwp *l, const struct netbsd32___timer_gettime50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_timer_t) timerid;
 		syscallarg(netbsd32_itimerspecp_t) value;
 	} */
 	int error;
 	struct itimerspec its;
 	struct netbsd32_itimerspec its32;
 	if ((error = dotimer_gettime(SCARG(uap, timerid), l->l_proc,
 	    &its)) != 0)
 		return error;
 	memset(&its32, 0, sizeof(its32));
 	netbsd32_from_timespec(&its.it_interval, &its32.it_interval);
 	netbsd32_from_timespec(&its.it_value, &its32.it_value);
 	return copyout(&its32, SCARG_P32(uap, value), sizeof(its32));
+}
 int
 netbsd32_timer_getoverrun(struct lwp *l, const struct netbsd32_timer_getoverrun_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_timer_t) timerid;
 	} */
 	struct sys_timer_getoverrun_args ua;

--- src/sys/compat/netbsd32/netbsd32_wait.c 2016/09/23 14:09:39	1.23
+++ src/sys/compat/netbsd32/netbsd32_wait.c 2023/06/21 21:04:01	1.23.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_wait.c,v 1.23 2016/09/23 14:09:39 skrll Exp $	*/
+/*	$NetBSD: netbsd32_wait.c,v 1.23.8.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.23 2016/09/23 14:09:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.23.8.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/ptrace.h>
 #include <sys/resourcevar.h>
 #include <sys/vnode.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 @@ -122,26 +122,27 @@ netbsd32_wait6(struct lwp *l, const stru
 	 * FreeBSD does for wait6(), so a tossup...  Go with FreeBSD for now.
 	 */
 	if (pid == 0)
 		return error;
 #endif
 	if (error == 0 && SCARG_P32(uap, status))
 		error = copyout(&status, SCARG_P32(uap, status),
 		    sizeof(status));
 	if (wrup != NULL && error == 0) {
 		struct netbsd32_wrusage wru32;
 		memset(&wru32, 0, sizeof(wru32));
 		netbsd32_from_rusage(&wrup->wru_self, &wru32.wru_self);
 		netbsd32_from_rusage(&wrup->wru_children, &wru32.wru_children);
 		error = copyout(&wru32, SCARG_P32(uap, wru), sizeof(wru32));
+	}
 	if (sip != NULL && error == 0) {
 	    	siginfo32_t si32;
 		netbsd32_si_to_si32(&si32, sip);
 		error = copyout(&si32, SCARG_P32(uap, info), sizeof(si32));
+	}
 	return error;
+}

--- src/sys/compat/ossaudio/ossaudio.c 2020/04/22 18:15:12	1.70.6.3
+++ src/sys/compat/ossaudio/ossaudio.c 2023/06/21 21:04:02	1.70.6.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.70.6.3 2020/04/22 18:15:12 martin Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.70.6.4 2023/06/21 21:04:02 martin Exp $	*/
 /*-
  * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70.6.3 2020/04/22 18:15:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.70.6.4 2023/06/21 21:04:02 martin Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/audioio.h>
 #include <sys/midiio.h>
 #include <sys/kauth.h>
 @@ -608,48 +608,50 @@ oss_ioctl_audio(struct lwp *l, const str
 			DPRINTF(("%s: SNDCTL_DSP_GETFMTS = %x = %d\n",
 			    __func__, idat, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_GETOSPACE:
 		error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETBUFINFO %d\n",
 			     __func__, error));
 			goto out;
+		}
 		setblocksize(fp, &tmpinfo);
 		memset(&bufinfo, 0, sizeof(bufinfo));
 		bufinfo.fragsize = tmpinfo.blocksize;
 		bufinfo.fragments = tmpinfo.hiwat -
 		    (tmpinfo.play.seek + tmpinfo.blocksize - 1) /
 		    tmpinfo.blocksize;
 		bufinfo.fragstotal = tmpinfo.hiwat;
 		bufinfo.bytes =
 		    tmpinfo.hiwat * tmpinfo.blocksize - tmpinfo.play.seek;
 		error = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_GETOSPACE = %d\n",
 			    __func__, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_GETISPACE:
 		error = ioctlf(fp, AUDIO_GETBUFINFO, &tmpinfo);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETBUFINFO %d\n",
 			     __func__, error));
 			goto out;
+		}
 		setblocksize(fp, &tmpinfo);
 		memset(&bufinfo, 0, sizeof(bufinfo));
 		bufinfo.fragsize = tmpinfo.blocksize;
 		bufinfo.fragments = tmpinfo.record.seek / tmpinfo.blocksize;
 		bufinfo.fragstotal = tmpinfo.hiwat;
 		bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
 		error = copyout(&bufinfo, SCARG(uap, data), sizeof bufinfo);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_GETISPACE %d %d %d %d = %d\n",
 			     __func__, bufinfo.fragsize, bufinfo.fragments,
 			     bufinfo.fragstotal, bufinfo.bytes, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_NONBLOCK:
 @@ -738,43 +740,45 @@ oss_ioctl_audio(struct lwp *l, const str
 			DPRINTF(("%s: SNDCTL_DSP_{GET,SET}RIGGER %x = %d\n",
 			    __func__, idat, error));
 			goto out;
+		}
 		break;
 #endif
 	case OSS_SNDCTL_DSP_GETIPTR:
 		error = ioctlf(fp, AUDIO_GETIOFFS, &tmpoffs);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETIOFFS %d\n",
 			     __func__, error));
 			goto out;
+		}
 		memset(&cntinfo, 0, sizeof(cntinfo));
 		cntinfo.bytes = tmpoffs.samples;
 		cntinfo.blocks = tmpoffs.deltablks;
 		cntinfo.ptr = tmpoffs.offset;
 		error = copyout(&cntinfo, SCARG(uap, data), sizeof cntinfo);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_GETIPTR %d\n",
 			    __func__, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_GETOPTR:
 		error = ioctlf(fp, AUDIO_GETOOFFS, &tmpoffs);
 		if (error) {
 			DPRINTF(("%s: AUDIO_GETOOFFS %d\n",
 			     __func__, error));
 			goto out;
+		}
 		memset(&cntinfo, 0, sizeof(cntinfo));
 		cntinfo.bytes = tmpoffs.samples;
 		cntinfo.blocks = tmpoffs.deltablks;
 		cntinfo.ptr = tmpoffs.offset;
 		error = copyout(&cntinfo, SCARG(uap, data), sizeof cntinfo);
 		if (error) {
 			DPRINTF(("%s: SNDCTL_DSP_GETOPTR %d\n",
 			    __func__, error));
 			goto out;
+		}
 		break;
 	case OSS_SNDCTL_DSP_SETDUPLEX:
 		idat = 1;
 		error = ioctlf(fp, AUDIO_SETFD, &idat);

--- src/sys/compat/sunos/sunos_ioctl.c 2016/10/08 15:48:07	1.68
+++ src/sys/compat/sunos/sunos_ioctl.c 2023/06/21 21:04:01	1.68.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $	*/
+/*	$NetBSD: sunos_ioctl.c,v 1.68.8.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1993 Markus Wild.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
 @@ -17,27 +17,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.68 2016/10/08 15:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.68.8.1 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 #include <sys/tty.h>
 #include <sys/socket.h>
 #include <sys/audioio.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 @@ -117,26 +117,28 @@ static void stio2stios(struct sunos_term
  *	Code may vary with different architectures of course.
+ *
  * I don't know what optimizer you used, but seeing divu's and
  * bfextu's in the m68k assembly output did not encourage me...
  * as well, gcc on the sparc definitely generates much better
  * code with `?:'.
  */
 static void
 stios2btios(struct sunos_termios *st, struct termios *bt)
+{
 	u_long l, r;
 	memset(bt, 0, sizeof(*bt));
 	l = st->c_iflag;
 	r = 	((l & 0x00000001) ? IGNBRK	: 0);
 	r |=	((l & 0x00000002) ? BRKINT	: 0);
 	r |=	((l & 0x00000004) ? IGNPAR	: 0);
 	r |=	((l & 0x00000008) ? PARMRK	: 0);
 	r |=	((l & 0x00000010) ? INPCK	: 0);
 	r |=	((l & 0x00000020) ? ISTRIP	: 0);
 	r |= 	((l & 0x00000040) ? INLCR	: 0);
 	r |=	((l & 0x00000080) ? IGNCR	: 0);
 	r |=	((l & 0x00000100) ? ICRNL	: 0);
 	/*	((l & 0x00000200) ? IUCLC	: 0) */
 	r |=	((l & 0x00000400) ? IXON	: 0);
 	r |=	((l & 0x00000800) ? IXANY	: 0);
 @@ -238,26 +240,28 @@ stios2btios(struct sunos_termios *st, st
 	/* if `raw mode', create native VMIN/VTIME from SunOS VEOF/VEOL */
 	bt->c_cc[VMIN]	   = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOF];
 	bt->c_cc[VTIME]	   = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOL];
+}
 static void
 btios2stios(struct termios *bt, struct sunos_termios *st)
+{
 	u_long l, r;
 	int s;
 	memset(st, 0, sizeof(*st));
 	l = bt->c_iflag;
 	r = 	((l &  IGNBRK) ? 0x00000001	: 0);
 	r |=	((l &  BRKINT) ? 0x00000002	: 0);
 	r |=	((l &  IGNPAR) ? 0x00000004	: 0);
 	r |=	((l &  PARMRK) ? 0x00000008	: 0);
 	r |=	((l &   INPCK) ? 0x00000010	: 0);
 	r |=	((l &  ISTRIP) ? 0x00000020	: 0);
 	r |=	((l &   INLCR) ? 0x00000040	: 0);
 	r |=	((l &   IGNCR) ? 0x00000080	: 0);
 	r |=	((l &   ICRNL) ? 0x00000100	: 0);
 	/*	((l &   IUCLC) ? 0x00000200	: 0) */
 	r |=	((l &    IXON) ? 0x00000400	: 0);
 	r |=	((l &   IXANY) ? 0x00000800	: 0);
 @@ -362,37 +366,41 @@ btios2stios(struct termios *bt, struct s
 	if (!(bt->c_lflag & ICANON)) {
 		/* SunOS stores VMIN/VTIME in VEOF/VEOL (if ICANON is off) */
 		st->c_cc[4] = bt->c_cc[VMIN];
 		st->c_cc[5] = bt->c_cc[VTIME];
+	}
 	st->c_line = 0;
+}
 static void
 stios2stio(struct sunos_termios *ts, struct sunos_termio *t)
+{
 	memset(t, 0, sizeof(*t));
 	t->c_iflag = ts->c_iflag;
 	t->c_oflag = ts->c_oflag;
 	t->c_cflag = ts->c_cflag;
 	t->c_lflag = ts->c_lflag;
 	t->c_line  = ts->c_line;
 	memcpy(t->c_cc, ts->c_cc, 8);
+}
 static void
 stio2stios(struct sunos_termio *t, struct sunos_termios *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	ts->c_iflag = t->c_iflag;
 	ts->c_oflag = t->c_oflag;
 	ts->c_cflag = t->c_cflag;
 	ts->c_lflag = t->c_lflag;
 	ts->c_line  = t->c_line;
 	memcpy(ts->c_cc, t->c_cc, 8); /* don't touch the upper fields! */
+}
 int
 sunos_sys_ioctl(struct lwp *l, const struct sunos_sys_ioctl_args *uap, register_t *retval)
+{
 	/* {
 		int	fd;
 @@ -474,26 +482,27 @@ sunos_sys_ioctl(struct lwp *l, const str
 		ws.ws_col = ss.ts_col;
 		error = (*ctl)(fp, TIOCSWINSZ, &ws);
 		break;
+	    }
 	case _IOW('t', 38, struct sunos_ttysize):
+	    {
 		struct winsize ws;
 		struct sunos_ttysize ss;
 		if ((error = (*ctl)(fp, TIOCGWINSZ, &ws)) != 0)
 			break;
 		memset(&ss, 0, sizeof(ss));
 		ss.ts_row = ws.ws_row;
 		ss.ts_col = ws.ws_col;
 		error = copyout((void *)&ss, SCARG(uap, data), sizeof (ss));
 		break;
+	    }
 	case _IOR('t', 119, int):	/* TIOCGPGRP */
+	    {
 		int pgrp;
 		error = (*ctl)(fp, TIOCGPGRP, &pgrp);
 		if (error == 0 && pgrp == 0)
 			error = EIO;
 @@ -714,26 +723,27 @@ sunos_sys_ioctl(struct lwp *l, const str
 /*
  * Audio ioctl translations.
  */
 	case _IOR('A', 1, struct sunos_audio_info):	/* AUDIO_GETINFO */
 	sunos_au_getinfo:
+	    {
 		struct audio_info aui;
 		struct sunos_audio_info sunos_aui;
 		error = (*ctl)(fp, AUDIO_GETINFO, &aui);
 		if (error)
 			break;
 		memset(&sunos_aui, 0, sizeof(sunos_aui));
 		sunos_aui.play = *(struct sunos_audio_prinfo *)&aui.play;
 		sunos_aui.record = *(struct sunos_audio_prinfo *)&aui.record;
 		/* `avail_ports' is `seek' in BSD */
 		sunos_aui.play.avail_ports = AUDIO_SPEAKER | AUDIO_HEADPHONE;
 		sunos_aui.record.avail_ports = AUDIO_SPEAKER | AUDIO_HEADPHONE;
 		sunos_aui.play.waiting = 0;
 		sunos_aui.record.waiting = 0;
 		sunos_aui.play.eof = 0;
 		sunos_aui.record.eof = 0;
 		sunos_aui.monitor_gain = 0; /* aui.__spare; XXX */
 		/*XXXsunos_aui.output_muted = 0;*/
 @@ -924,52 +934,58 @@ struct sunos_flock {
 	short	l_xxx;
 };
 static void bsd_to_sunos_flock(struct flock *, struct sunos_flock *);
 static void sunos_to_bsd_flock(struct sunos_flock *, struct flock *);
 #define SUNOS_F_RDLCK	1
 #define	SUNOS_F_WRLCK	2
 #define SUNOS_F_UNLCK	3
 static void
 bsd_to_sunos_flock(struct flock *iflp, struct sunos_flock *oflp)
+{
 	memset(oflp, 0, sizeof(*oflp));
 	switch (iflp->l_type) {
 	case F_RDLCK:
 		oflp->l_type = SUNOS_F_RDLCK;
 		break;
 	case F_WRLCK:
 		oflp->l_type = SUNOS_F_WRLCK;
 		break;
 	case F_UNLCK:
 		oflp->l_type = SUNOS_F_UNLCK;
 		break;
 	default:
 		oflp->l_type = -1;
 		break;
+	}
 	oflp->l_whence = (short) iflp->l_whence;
 	oflp->l_start = (long) iflp->l_start;
 	oflp->l_len = (long) iflp->l_len;
 	oflp->l_pid = (short) iflp->l_pid;
 	oflp->l_xxx = 0;
+}
 static void
 sunos_to_bsd_flock(struct sunos_flock *iflp, struct flock *oflp)
+{
 	memset(oflp, 0, sizeof(*oflp));
 	switch (iflp->l_type) {
 	case SUNOS_F_RDLCK:
 		oflp->l_type = F_RDLCK;
 		break;
 	case SUNOS_F_WRLCK:
 		oflp->l_type = F_WRLCK;
 		break;
 	case SUNOS_F_UNLCK:
 		oflp->l_type = F_UNLCK;
 		break;
 	default:
 		oflp->l_type = -1;
 		break;

--- src/sys/compat/sunos/sunos_misc.c 2017/08/09 05:12:18	1.170.10.1
+++ src/sys/compat/sunos/sunos_misc.c 2023/06/21 21:04:01	1.170.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunos_misc.c,v 1.170.10.1 2017/08/09 05:12:18 snj Exp $	*/
+/*	$NetBSD: sunos_misc.c,v 1.170.10.2 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Lawrence Berkeley Laboratory.
 @@ -40,27 +40,27 @@
  *	@(#)sunos_misc.c	8.1 (Berkeley) 6/18/93
+ *
  *	Header: sunos_misc.c,v 1.16 93/04/07 02:46:27 torek Exp
  */
 /*
  * SunOS compatibility module.
+ *
  * SunOS system calls that are implemented differently in BSD are
  * handled here.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.170.10.1 2017/08/09 05:12:18 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.170.10.2 2023/06/21 21:04:01 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/malloc.h>
 @@ -295,33 +295,35 @@ sunos_sys_mount(struct lwp *l, const str
 int
 async_daemon(struct lwp *l, const void *v, register_t *retval)
+{
 	return kpause("fakeniod", false, 0, NULL);
+}
 void	native_to_sunos_sigset(const sigset_t *, int *);
 void	sunos_to_native_sigset(const int, sigset_t *);
 inline void
 native_to_sunos_sigset(const sigset_t *ss, int *mask)
+{
 	*mask = ss->__bits[0];
+}
 inline void
 sunos_to_native_sigset(const int mask, sigset_t *ss)
+{
 	memset(ss, 0, sizeof(*ss));
 	ss->__bits[0] = mask;
 	ss->__bits[1] = 0;
 	ss->__bits[2] = 0;
 	ss->__bits[3] = 0;
+}
 int
 sunos_sys_sigpending(struct lwp *l, const struct sunos_sys_sigpending_args *uap, register_t *retval)
+{
 	sigset_t ss;
 	int mask;
 	sigpending1(l, &ss);
 @@ -421,26 +423,27 @@ again:
 		if ((*cookie >> 32) != 0) {
 			compat_offseterr(vp, "sunos_getdents");
 			error = EINVAL;
 			goto out;
+		}
 		if (bdp->d_fileno == 0) {
 			inp += reclen;	/* it is a hole; squish it out */
 			if (cookie)
 				off = *cookie++;
 			else
 				off += reclen;
 			continue;
+		}
 		memset(&idb, 0, sizeof(idb));
 		sunos_reclen = SUNOS_RECLEN(&idb, bdp->d_namlen);
 		if (reclen > len || resid < sunos_reclen) {
 			/* entry too big for buffer, so just stop */
 			outp++;
 			break;
+		}
 		if (cookie)
 			off = *cookie++;	/* each entry points to next */
 		else
 			off += reclen;
 		/*
 		 * Massage in place to make a Sun-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of

--- src/sys/compat/sunos32/sunos32_ioctl.c 2015/12/11 08:10:43	1.34
+++ src/sys/compat/sunos32/sunos32_ioctl.c 2023/06/21 21:04:03	1.34.10.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunos32_ioctl.c,v 1.34 2015/12/11 08:10:43 mlelstv Exp $	*/
+/*	$NetBSD: sunos32_ioctl.c,v 1.34.10.1 2023/06/21 21:04:03 martin Exp $	*/
 /* from: NetBSD: sunos_ioctl.c,v 1.35 2001/02/03 22:20:02 mrg Exp 	*/
 /*
  * Copyright (c) 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -44,27 +44,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.34 2015/12/11 08:10:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.34.10.1 2023/06/21 21:04:03 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd32.h"
 #include "opt_execfmt.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 @@ -153,26 +153,28 @@ static void stio2stios(struct sunos_term
  *	Code may vary with different architectures of course.
+ *
  * I don't know what optimizer you used, but seeing divu's and
  * bfextu's in the m68k assembly output did not encourage me...
  * as well, gcc on the sparc definitely generates much better
  * code with `?:'.
  */
 static void
 stios2btios(struct sunos_termios *st, struct termios *bt)
+{
 	netbsd32_u_long l, r;
 	memset(bt, 0, sizeof(*bt));
 	l = st->c_iflag;
 	r = 	((l & 0x00000001) ? IGNBRK	: 0);
 	r |=	((l & 0x00000002) ? BRKINT	: 0);
 	r |=	((l & 0x00000004) ? IGNPAR	: 0);
 	r |=	((l & 0x00000008) ? PARMRK	: 0);
 	r |=	((l & 0x00000010) ? INPCK	: 0);
 	r |=	((l & 0x00000020) ? ISTRIP	: 0);
 	r |= 	((l & 0x00000040) ? INLCR	: 0);
 	r |=	((l & 0x00000080) ? IGNCR	: 0);
 	r |=	((l & 0x00000100) ? ICRNL	: 0);
 	/*	((l & 0x00000200) ? IUCLC	: 0) */
 	r |=	((l & 0x00000400) ? IXON	: 0);
 	r |=	((l & 0x00000800) ? IXANY	: 0);
 @@ -274,26 +276,28 @@ stios2btios(struct sunos_termios *st, st
 	/* if `raw mode', create native VMIN/VTIME from SunOS VEOF/VEOL */
 	bt->c_cc[VMIN]	   = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOF];
 	bt->c_cc[VTIME]	   = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOL];
+}
 static void
 btios2stios(struct termios *bt, struct sunos_termios *st)
+{
 	netbsd32_u_long l, r;
 	int s;
 	memset(st, 0, sizeof(*st));
 	l = bt->c_iflag;
 	r = 	((l &  IGNBRK) ? 0x00000001	: 0);
 	r |=	((l &  BRKINT) ? 0x00000002	: 0);
 	r |=	((l &  IGNPAR) ? 0x00000004	: 0);
 	r |=	((l &  PARMRK) ? 0x00000008	: 0);
 	r |=	((l &   INPCK) ? 0x00000010	: 0);
 	r |=	((l &  ISTRIP) ? 0x00000020	: 0);
 	r |=	((l &   INLCR) ? 0x00000040	: 0);
 	r |=	((l &   IGNCR) ? 0x00000080	: 0);
 	r |=	((l &   ICRNL) ? 0x00000100	: 0);
 	/*	((l &   IUCLC) ? 0x00000200	: 0) */
 	r |=	((l &    IXON) ? 0x00000400	: 0);
 	r |=	((l &   IXANY) ? 0x00000800	: 0);
 @@ -398,37 +402,41 @@ btios2stios(struct termios *bt, struct s
 	if (!(bt->c_lflag & ICANON)) {
 		/* SunOS stores VMIN/VTIME in VEOF/VEOL (if ICANON is off) */
 		st->c_cc[4] = bt->c_cc[VMIN];
 		st->c_cc[5] = bt->c_cc[VTIME];
+	}
 	st->c_line = 0;
+}
 static void
 stios2stio(struct sunos_termios *ts, struct sunos_termio *t)
+{
 	memset(t, 0, sizeof(*t));
 	t->c_iflag = ts->c_iflag;
 	t->c_oflag = ts->c_oflag;
 	t->c_cflag = ts->c_cflag;
 	t->c_lflag = ts->c_lflag;
 	t->c_line  = ts->c_line;
 	memcpy(t->c_cc, ts->c_cc, 8);
+}
 static void
 stio2stios(struct sunos_termio *t, struct sunos_termios *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	ts->c_iflag = t->c_iflag;
 	ts->c_oflag = t->c_oflag;
 	ts->c_cflag = t->c_cflag;
 	ts->c_lflag = t->c_lflag;
 	ts->c_line  = t->c_line;
 	memcpy(ts->c_cc, t->c_cc, 8); /* don't touch the upper fields! */
+}
 static int
 sunos32_do_ioctl(int fd, int cmd, void *arg, struct lwp *l)
+{
 	file_t *fp;
 @@ -518,26 +526,27 @@ sunos32_sys_ioctl(struct lwp *l, const s
 		ws.ws_row = ss.ts_row;
 		ws.ws_col = ss.ts_col;
 		return (sunos32_do_ioctl(SCARG(&bsd_ua, fd), TIOCSWINSZ, &ws, l));
+	    }
 	case _IOW('t', 38, struct sunos_ttysize):
+	    {
 		struct winsize ws;
 		struct sunos_ttysize ss;
 		if ((error = sunos32_do_ioctl(SCARG(&bsd_ua, fd), TIOCGWINSZ, &ws, l)) != 0)
 			return (error);
 		memset(&ss, 0, sizeof(ss));
 		ss.ts_row = ws.ws_row;
 		ss.ts_col = ws.ws_col;
 		return copyout(&ss, SCARG_P32(uap, data), sizeof (ss));
+	    }
 	case _IOW('t', 130, int):	/* TIOCSETPGRP: posix variant */
 		SCARG(&bsd_ua, com) = TIOCSPGRP;
 		break;
 	case _IOR('t', 131, int):	/* TIOCGETPGRP: posix variant */
+	    {
 		/*
 		 * sigh, must do error translation on pty devices
 		 * (see also kern/tty_pty.c)
 @@ -746,26 +755,28 @@ sunos32_sys_ioctl(struct lwp *l, const s
 /*
  * Audio ioctl translations.
  */
 	case _IOR('A', 1, struct sunos_audio_info):	/* AUDIO_GETINFO */
 	sunos_au_getinfo:
+	    {
 		struct audio_info aui;
 		struct sunos_audio_info sunos_aui;
 		error = sunos32_do_ioctl(SCARG(&bsd_ua, fd), AUDIO_GETINFO, &aui, l);
 		if (error)
 			return error;
 		memset(&sunos_aui, 0, sizeof(sunos_aui));
 		sunos_aui.play = *(struct sunos_audio_prinfo *)&aui.play;
 		sunos_aui.record = *(struct sunos_audio_prinfo *)&aui.record;
 		/* `avail_ports' is `seek' in BSD */
 		sunos_aui.play.avail_ports = AUDIO_SPEAKER | AUDIO_HEADPHONE;
 		sunos_aui.record.avail_ports = AUDIO_SPEAKER | AUDIO_HEADPHONE;
 		sunos_aui.play.waiting = 0;
 		sunos_aui.record.waiting = 0;
 		sunos_aui.play.eof = 0;
 		sunos_aui.record.eof = 0;
 		sunos_aui.monitor_gain = 0; /* aui.__spare; XXX */
 		/*XXXsunos_aui.output_muted = 0;*/
 @@ -940,52 +951,58 @@ struct sunos_flock {
 	short	l_xxx;
 };
 static void bsd_to_sunos_flock(struct flock *, struct sunos_flock *);
 static void sunos_to_bsd_flock(struct sunos_flock *, struct flock *);
 #define SUNOS_F_RDLCK	1
 #define	SUNOS_F_WRLCK	2
 #define SUNOS_F_UNLCK	3
 static void
 bsd_to_sunos_flock(struct flock *iflp, struct sunos_flock *oflp)
+{
 	memset(oflp, 0, sizeof(*oflp));
 	switch (iflp->l_type) {
 	case F_RDLCK:
 		oflp->l_type = SUNOS_F_RDLCK;
 		break;
 	case F_WRLCK:
 		oflp->l_type = SUNOS_F_WRLCK;
 		break;
 	case F_UNLCK:
 		oflp->l_type = SUNOS_F_UNLCK;
 		break;
 	default:
 		oflp->l_type = -1;
 		break;
+	}
 	oflp->l_whence = (short) iflp->l_whence;
 	oflp->l_start = (netbsd32_long) iflp->l_start;
 	oflp->l_len = (netbsd32_long) iflp->l_len;
 	oflp->l_pid = (short) iflp->l_pid;
 	oflp->l_xxx = 0;
+}
 static void
 sunos_to_bsd_flock(struct sunos_flock *iflp, struct flock *oflp)
+{
 	memset(oflp, 0, sizeof(*oflp));
 	switch (iflp->l_type) {
 	case SUNOS_F_RDLCK:
 		oflp->l_type = F_RDLCK;
 		break;
 	case SUNOS_F_WRLCK:
 		oflp->l_type = F_WRLCK;
 		break;
 	case SUNOS_F_UNLCK:
 		oflp->l_type = F_UNLCK;
 		break;
 	default:
 		oflp->l_type = -1;
 		break;

--- src/sys/compat/sunos32/sunos32_misc.c 2017/08/09 05:12:18	1.77.10.1
+++ src/sys/compat/sunos32/sunos32_misc.c 2023/06/21 21:04:03	1.77.10.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sunos32_misc.c,v 1.77.10.1 2017/08/09 05:12:18 snj Exp $	*/
+/*	$NetBSD: sunos32_misc.c,v 1.77.10.2 2023/06/21 21:04:03 martin Exp $	*/
 /* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp	*/
 /*
  * Copyright (c) 2001 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -67,27 +67,27 @@
  *	@(#)sunos_misc.c	8.1 (Berkeley) 6/18/93
+ *
  *	Header: sunos_misc.c,v 1.16 93/04/07 02:46:27 torek Exp
  */
 /*
  * SunOS compatibility module, 64-bit kernel version
+ *
  * SunOS system calls that are implemented differently in BSD are
  * handled here.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.77.10.1 2017/08/09 05:12:18 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.77.10.2 2023/06/21 21:04:03 martin Exp $");
 #define COMPAT_SUNOS 1
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 @@ -151,26 +151,27 @@ sunos32_sigvec_to_sigaction(const struct
 	sa->sa_handler = NETBSD32PTR64(sv->sv_handler);
 	compat_43_sigmask_to_sigset(&sv->sv_mask, &sa->sa_mask);
 	sa->sa_flags = sv->sv_flags ^ SA_RESTART;
+}
 static void
 sunos32_sigvec_from_sigaction(
 	struct netbsd32_sigvec *sv,
 	const struct sigaction *sa)
+{
 /*XXX*/ extern void compat_43_sigset_to_sigmask(const sigset_t *, int *);
 	memset(sv, 0, sizeof(*sv));
 	NETBSD32PTR32(sv->sv_handler, sa->sa_handler);
 	compat_43_sigset_to_sigmask(&sa->sa_mask, &sv->sv_mask);
 	sv->sv_flags = sa->sa_flags ^ SA_RESTART;
+}
 int
 sunos32_sys_stime(struct lwp *l, const struct sunos32_sys_stime_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(sunos32_time_tp) tp;
 	} */
 	struct netbsd32_timeval ntv;
 	struct timeval tv;
 @@ -531,33 +532,35 @@ sunos32_sys_mount(struct lwp *l, const s
 		strcpy(fsname, "ffs");
 	return do_sys_mount(l, fsname, UIO_SYSSPACE,
 	    SCARG_P32(uap, path), nflags, SCARG_P32(uap, data), UIO_USERSPACE,
 , &dummy);
+}
 void	native_to_sunos_sigset(const sigset_t *, int *);
 void	sunos_to_native_sigset(const int, sigset_t *);
 inline void
 native_to_sunos_sigset(const sigset_t *ss, int *mask)
+{
 	*mask = ss->__bits[0];
+}
 inline void
 sunos_to_native_sigset(const int mask, sigset_t *ss)
+{
 	memset(ss, 0, sizeof(*ss));
 	ss->__bits[0] = mask;
 	ss->__bits[1] = 0;
 	ss->__bits[2] = 0;
 	ss->__bits[3] = 0;
+}
 int
 sunos32_sys_sigpending(struct lwp *l, const struct sunos32_sys_sigpending_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(netbsd32_intp) mask;
 	} */
 	sigset_t ss;
 @@ -666,26 +669,27 @@ again:
 		if (cookie && (*cookie >> 32) != 0) {
 			compat_offseterr(vp, "sunos_getdents");
 			error = EINVAL;
 			goto out;
+		}
 		if (bdp->d_fileno == 0) {
 			inp += reclen;	/* it is a hole; squish it out */
 			if (cookie)
 				off = *cookie++;
 			else
 				off += reclen;
 			continue;
+		}
 		memset(&idb, 0, sizeof(idb));
 		sunos_reclen = SUNOS32_RECLEN(&idb, bdp->d_namlen);
 		if (reclen > len || resid < sunos_reclen) {
 			/* entry too big for buffer, so just stop */
 			outp++;
 			break;
+		}
 		if (cookie)
 			off = *cookie++;	/* each entry points to next */
 		else
 			off += reclen;
 		/*
 		 * Massage in place to make a Sun-shaped dirent (otherwise
 		 * we have to worry about touching user memory outside of

--- src/sys/compat/sys/time_types.h 2019/01/03 09:00:01	1.1.58.1
+++ src/sys/compat/sys/time_types.h 2023/06/21 21:04:02	1.1.58.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: time_types.h,v 1.1.58.1 2019/01/03 09:00:01 martin Exp $	*/
+/*	$NetBSD: time_types.h,v 1.1.58.2 2023/06/21 21:04:02 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -62,70 +62,80 @@ struct timespec50 {
 	int32_t	tv_sec;		/* seconds */
 	long	tv_nsec;	/* and nanoseconds */
 };
 /*
  * Structure defined by POSIX.1b to be like a itimerval, but with
  * timespecs. Used in the timer_*() system calls.
  */
 struct	itimerspec50 {
 	struct	timespec50 it_interval;
 	struct	timespec50 it_value;
 };
-static __inline void timeval50_to_timeval(const struct timeval50 *ts50,
+static __inline void
-    struct timeval *ts)
+timeval50_to_timeval(const struct timeval50 *ts50, struct timeval *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	ts->tv_sec = ts50->tv_sec;
 	ts->tv_usec = (suseconds_t)ts50->tv_usec;
+}
-static __inline void timeval_to_timeval50(const struct timeval *ts,
+static __inline void
-    struct timeval50 *ts50)
+timeval_to_timeval50(const struct timeval *ts, struct timeval50 *ts50)
+{
 	memset(ts50, 0, sizeof(*ts50));
 	ts50->tv_sec = (long)ts->tv_sec;
 	ts50->tv_usec = ts->tv_usec;
+}
-static __inline void timespec50_to_timespec(const struct timespec50 *ts50,
+static __inline void
-    struct timespec *ts)
+timespec50_to_timespec(const struct timespec50 *ts50, struct timespec *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	ts->tv_sec = ts50->tv_sec;
 	ts->tv_nsec = ts50->tv_nsec;
+}
-static __inline void timespec_to_timespec50(const struct timespec *ts,
+static __inline void
-    struct timespec50 *ts50)
+timespec_to_timespec50(const struct timespec *ts, struct timespec50 *ts50)
+{
 	memset(ts50, 0, sizeof(*ts50));
 	ts50->tv_sec = (int32_t)ts->tv_sec;
 	ts50->tv_nsec = ts->tv_nsec;
+}
-static __inline void itimerval50_to_itimerval(const struct itimerval50 *ts50,
+static __inline void
-    struct itimerval *ts)
+itimerval50_to_itimerval(const struct itimerval50 *ts50, struct itimerval *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	timeval50_to_timeval(&ts50->it_interval, &ts->it_interval);
 	timeval50_to_timeval(&ts50->it_value, &ts->it_value);
+}
-static __inline void itimerval_to_itimerval50(const struct itimerval *ts,
+static __inline void
-    struct itimerval50 *ts50)
+itimerval_to_itimerval50(const struct itimerval *ts, struct itimerval50 *ts50)
+{
 	memset(ts50, 0, sizeof(*ts50));
 	timeval_to_timeval50(&ts->it_interval, &ts50->it_interval);
 	timeval_to_timeval50(&ts->it_value, &ts50->it_value);
+}
-static __inline void itimerspec50_to_itimerspec(const struct itimerspec50 *ts50,
+static __inline void
 itimerspec50_to_itimerspec(const struct itimerspec50 *ts50,
     struct itimerspec *ts)
+{
 	memset(ts, 0, sizeof(*ts));
 	timespec50_to_timespec(&ts50->it_interval, &ts->it_interval);
 	timespec50_to_timespec(&ts50->it_value, &ts->it_value);
+}
-static __inline void itimerspec_to_itimerspec50(const struct itimerspec *ts,
+static __inline void
 itimerspec_to_itimerspec50(const struct itimerspec *ts,
     struct itimerspec50 *ts50)
+{
 	memset(ts50, 0, sizeof(*ts50));
 	timespec_to_timespec50(&ts->it_interval, &ts50->it_interval);
 	timespec_to_timespec50(&ts->it_value, &ts50->it_value);
+}
 #endif /* _COMPAT_SYS_TIME_TYPES_H_ */

--- src/sys/compat/ultrix/ultrix_ioctl.c 2016/10/08 15:48:07	1.37
+++ src/sys/compat/ultrix/ultrix_ioctl.c 2023/06/21 21:04:01	1.37.8.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $ */
+/*	$NetBSD: ultrix_ioctl.c,v 1.37.8.1 2023/06/21 21:04:01 martin Exp $ */
 /*	from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
 /*
  * Copyright (c) 1993 Markus Wild.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.37 2016/10/08 15:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.37.8.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_ultrix.h"
 #include "opt_compat_sunos.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
 @@ -135,26 +135,28 @@ static void stio2stios(struct emul_termi
+ *
  * I don't know what optimizer you used, but seeing divu's and
  * bfextu's in the m68k assembly output did not encourage me...
  * as well, gcc on the sparc definately generates much better
  * code with ?:.
  */
 static void
 stios2btios(struct emul_termios *st, struct termios *bt)
+{
 	uint32_t l, r;
 	memset(bt, 0, sizeof(*bt));
 	l = st->c_iflag;
 	r = 	((l & 0x00000001) ? IGNBRK	: 0);
 	r |=	((l & 0x00000002) ? BRKINT	: 0);
 	r |=	((l & 0x00000004) ? IGNPAR	: 0);
 	r |=	((l & 0x00000008) ? PARMRK	: 0);
 	r |=	((l & 0x00000010) ? INPCK	: 0);
 	r |=	((l & 0x00000020) ? ISTRIP	: 0);
 	r |= 	((l & 0x00000040) ? INLCR	: 0);
 	r |=	((l & 0x00000080) ? IGNCR	: 0);
 	r |=	((l & 0x00000100) ? ICRNL	: 0);
 	/*	((l & 0x00000200) ? IUCLC	: 0) */
 	r |=	((l & 0x00000400) ? IXON	: 0);
 	r |=	((l & 0x00000800) ? IXANY	: 0);
 @@ -266,26 +268,28 @@ stios2btios(struct emul_termios *st, str
 #endif
+}
 /*
  * Convert bsd termios to "sunos" emulated termios
  */
 static void
 btios2stios(struct termios *bt, struct emul_termios *st)
+{
 	uint32_t l, r;
 	int speed;
 	memset(st, 0, sizeof(*st));
 	l = bt->c_iflag;
 	r = 	((l &  IGNBRK) ? 0x00000001	: 0);
 	r |=	((l &  BRKINT) ? 0x00000002	: 0);
 	r |=	((l &  IGNPAR) ? 0x00000004	: 0);
 	r |=	((l &  PARMRK) ? 0x00000008	: 0);
 	r |=	((l &   INPCK) ? 0x00000010	: 0);
 	r |=	((l &  ISTRIP) ? 0x00000020	: 0);
 	r |=	((l &   INLCR) ? 0x00000040	: 0);
 	r |=	((l &   IGNCR) ? 0x00000080	: 0);
 	r |=	((l &   ICRNL) ? 0x00000100	: 0);
 	/*	((l &   IUCLC) ? 0x00000200	: 0) */
 	r |=	((l &    IXON) ? 0x00000400	: 0);
 	r |=	((l &   IXANY) ? 0x00000800	: 0);
 @@ -409,40 +413,44 @@ btios2stios(struct termios *bt, struct e
 #else
 	st->c_line = 2;	/* 4.3bsd "new" line discipline, Ultrix default. */
 #endif
+}
 #define TERMIO_NCC 10	/* ultrix termio NCC is 10 */
 /*
  * Convert emulated struct termios to termio(?)
  */
 static void
 stios2stio(struct emul_termios *ts, struct emul_termio *t)
+{
 	memset(t, 0, sizeof(*t));
 	t->c_iflag = ts->c_iflag;
 	t->c_oflag = ts->c_oflag;
 	t->c_cflag = ts->c_cflag;
 	t->c_lflag = ts->c_lflag;
 	t->c_line  = ts->c_line;
 	memcpy(t->c_cc, ts->c_cc, TERMIO_NCC);
+}
 /*
  * Convert the other way
  */
 static void
 stio2stios(struct emul_termio *t, struct emul_termios *ts)
+{
 	memset(ts, 0, sizeof(*t));
 	ts->c_iflag = t->c_iflag;
 	ts->c_oflag = t->c_oflag;
 	ts->c_cflag = t->c_cflag;
 	ts->c_lflag = t->c_lflag;
 	ts->c_line  = t->c_line;
 	memcpy(ts->c_cc, t->c_cc, TERMIO_NCC); /* don't touch the upper fields! */
+}
 static int
 ultrix_do_ioctl(int fd, int cmd, void *arg, struct lwp *l)
+{
 	file_t *fp;
 	int error;
 @@ -518,26 +526,27 @@ ultrix_sys_ioctl(struct lwp *l, const st
 		ws.ws_row = ss.ts_row;
 		ws.ws_col = ss.ts_col;
 		return ultrix_do_ioctl(SCARG(&ap, fd), TIOCSWINSZ, &ws, l);
+	    }
 	case _IOW('t', 38, struct sunos_ttysize):
+	    {
 		struct winsize ws;
 		struct sunos_ttysize ss;
 		if ((error = ultrix_do_ioctl(SCARG(&ap, fd), TIOCGWINSZ, &ws, l)) != 0)
 			return error;
 		memset(&ss, 0, sizeof(ss));
 		ss.ts_row = ws.ws_row;
 		ss.ts_col = ws.ws_col;
 		return copyout (&ss, SCARG(&ap, data), sizeof (ss));
+	    }
 	case _IOW('t', 118, int):
 		SCARG(&ap, com) = TIOCSPGRP;
 		break;
 	case _IOR('t', 119, int):
 		SCARG(&ap, com) = TIOCGPGRP;
 		break;
 	/* Emulate termio or termios tcget() */

--- src/sys/compat/ultrix/ultrix_misc.c 2012/02/19 21:06:45	1.122
+++ src/sys/compat/ultrix/ultrix_misc.c 2023/06/21 21:04:01	1.122.32.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ultrix_misc.c,v 1.122 2012/02/19 21:06:45 rmind Exp $	*/
+/*	$NetBSD: ultrix_misc.c,v 1.122.32.1 2023/06/21 21:04:01 martin Exp $	*/
 /*
  * Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -66,27 +66,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
+ *
  * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.122 2012/02/19 21:06:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.122.32.1 2023/06/21 21:04:01 martin Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
 #endif
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /*
  * Ultrix compatibility module.
+ *
  * Ultrix system calls that are implemented differently in BSD are
  * handled here.
  */
 @@ -618,26 +618,27 @@ ultrix_sys_sigvec(struct lwp *l, const s
 			nsa.sa_flags |= SA_RESTART;
 #else /* optimized - assuming ULTRIX_SV_OLDSIG=>!ULTRIX_SV_INTERRUPT */
 		nsa.sa_flags = nsv.sv_flags & ~ULTRIX_SV_OLDSIG;
 		nsa.sa_flags ^= SA_RESTART;
 #endif
 		native_sigset13_to_sigset(&nsv.sv_mask, &nsa.sa_mask);
+	}
 	error = sigaction1(l, SCARG(uap, signum),
 	    SCARG(uap, nsv) ? &nsa : 0, SCARG(uap, osv) ? &osa : 0,
 	    NULL, 0);
 	if (error)
 		return error;
 	if (SCARG(uap, osv)) {
 		memset(&osv, 0, sizeof(osv));
 		osv.sv_handler = osa.sa_handler;
 		osv.sv_flags = osa.sa_flags ^ SA_RESTART;
 		osv.sv_flags &= (ULTRIX_SV_ONSTACK | ULTRIX_SV_INTERRUPT);
 		native_sigset_to_sigset13(&osa.sa_mask, &osv.sv_mask);
 		error = copyout(&osv, SCARG(uap, osv), sizeof(osv));
 		if (error)
 			return error;
+	}
 	return 0;
+}
 int
 ultrix_sys_shmsys(struct lwp *l, const struct ultrix_sys_shmsys_args *uap, register_t *retval)
 @@ -677,52 +678,56 @@ ultrix_sys_shmsys(struct lwp *l, const s
 	default:
 		return EINVAL;
+	}
 #else
 	return EOPNOTSUPP;
 #endif	/* SYSVSHM */
+}
 static int
 ultrix_to_bsd_flock(struct ultrix_flock *ufl, struct flock *fl)
+{
 	memset(fl, 0, sizeof(*fl));
 	fl->l_start = ufl->l_start;
 	fl->l_len = ufl->l_len;
 	fl->l_pid = ufl->l_pid;
 	fl->l_whence = ufl->l_whence;
 	switch (ufl->l_type) {
 	case ULTRIX_F_RDLCK:
 		fl->l_type = F_RDLCK;
 		break;
 	case ULTRIX_F_WRLCK:
 		fl->l_type = F_WRLCK;
 		break;
 	case ULTRIX_F_UNLCK:
 		fl->l_type = F_UNLCK;
 		break;
 	default:
 		return EINVAL;
+	}
 	return 0;
+}
 static void
 bsd_to_ultrix_flock(struct flock *fl, struct ultrix_flock *ufl)
+{
 	memset(ufl, 0, sizeof(*ufl));
 	ufl->l_start = fl->l_start;
 	ufl->l_len = fl->l_len;
 	ufl->l_pid = fl->l_pid;
 	ufl->l_whence = fl->l_whence;
 	switch (fl->l_type) {
 	case F_RDLCK:
 		ufl->l_type = ULTRIX_F_RDLCK;
 		break;
 	case F_WRLCK:
 		ufl->l_type = ULTRIX_F_WRLCK;
 		break;
 	case F_UNLCK: