 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.71.2.2 2020/12/17 03:05:32 thorpej Exp $
+	$NetBSD: syscalls.master,v 1.71.2.3 2021/01/03 16:12:43 thorpej Exp $
 ; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; types:
 ;	STD	always included
 ;	OBSOL	obsolete, not included in system
 ;	UNIMPL	unimplemented, not included in system
 @@ -557,28 +557,32 @@
 			    off_t offset, off_t len); }
 	STD	{ int|linux32_sys||timerfd_settime(int fd, int flags, \
 		    const struct linux32_itimerspec *new_value, \
 		    struct linux32_itimerspec *old_value); }
 	STD	{ int|linux32_sys||timerfd_gettime(int fd, \
 		    struct linux32_itimerspec *curr_value); }
 	UNIMPL	signalfd4
 	STD	{ int|linux32_sys||eventfd2(unsigned int initval, \
 		    int flags); }
 	UNIMPL	epoll_create1
 	STD	{ int|linux32_sys||dup3(int from, int to, int flags); }
 STD	{ int|linux32_sys||pipe2(netbsd32_intp fd, int flags); }
 	UNIMPL	inotify_init1
-	UNIMPL	preadv
+	STD	{ int|linux32_sys||preadv(int fd, \
-	UNIMPL	pwritev
+		    const netbsd32_iovecp_t iovp, int iovcnt, \
 		    netbsd32_u_long off_lo, netbsd32_u_long off_hi); }
 	STD	{ int|linux32_sys||pwritev(int fd, \
 		    const netbsd32_iovecp_t iovp, int iovcnt, \
 		    netbsd32_u_long off_lo, netbsd32_u_long off_hi); }
 	UNIMPL	rt_tgsigqueueinfo
 	UNIMPL	perf_counter_open
 	UNIMPL	recvmmsg
 	UNIMPL	fanotify_init
 	UNIMPL	fanotify_mark
 	UNIMPL	prlimit64
 	UNIMPL	name_to_handle_at
 	UNIMPL	open_by_handle_at
 	UNIMPL	clock_adjtime
 	UNIMPL	syncfs
 	UNIMPL	sendmmsg
 	UNIMPL	setns
 	UNIMPL	process_vm_readv

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_misc.c,v 1.30.2.2 2020/12/17 03:02:06 thorpej Exp $	*/
+/*	$NetBSD: linux32_misc.c,v 1.30.2.3 2021/01/03 16:12:44 thorpej Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999 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;
  * by Edgar Fu\ss, Mathematisches Institut der Uni Bonn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -22,27 +22,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_misc.c,v 1.30.2.2 2020/12/17 03:02:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.30.2.3 2021/01/03 16:12:44 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/fstypes.h>
 #include <sys/vfs_syscalls.h>
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
 #include <sys/poll.h>
 #include <sys/futex.h>
 #include <compat/netbsd32/netbsd32.h>
 @@ -370,13 +370,63 @@ linux32_sys_eventfd2(struct lwp *l, cons
     register_t *retval)
+{
 	/* {
 		syscallarg(unsigned int) initval;
 		syscallarg(int) flags;
 	} */
 	struct linux_sys_eventfd2_args ua;
 	NETBSD32TO64_UAP(initval);
 	NETBSD32TO64_UAP(flags);
 	return linux_sys_eventfd2(l, &ua, retval);
+}
 static inline off_t
 linux32_hilo_to_off_t(unsigned long hi, unsigned long lo)
+{
 	return (((off_t)hi) << 32) | lo;
+}
 int
 linux32_sys_preadv(struct lwp *l, const struct linux32_sys_preadv_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
 		syscallarg(netbsd32_u_long) off_lo;
 		syscallarg(netbsd32_u_long) off_hi;
 	} */
 	struct netbsd32_preadv_args ua;
 	SCARG(&ua, fd) = SCARG(uap, fd);
 	SCARG(&ua, iovp) = SCARG(uap, iovp);
 	SCARG(&ua, iovcnt) = SCARG(uap, iovcnt);
 	SCARG(&ua, PAD) = 0;
 	SCARG(&ua, offset) = linux32_hilo_to_off_t(SCARG(uap, off_hi),
 						   SCARG(uap, off_lo));
 	return netbsd32_preadv(l, &ua, retval);
+}
 int
 linux32_sys_pwritev(struct lwp *l, const struct linux32_sys_pwritev_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
 		syscallarg(netbsd32_u_long) off_lo;
 		syscallarg(netbsd32_u_long) off_hi;
 	} */
 	struct netbsd32_pwritev_args ua;
 	SCARG(&ua, fd) = SCARG(uap, fd);
 	SCARG(&ua, iovp) = SCARG(uap, iovp);
 	SCARG(&ua, iovcnt) = SCARG(uap, iovcnt);
 	SCARG(&ua, PAD) = 0;
 	SCARG(&ua, offset) = linux32_hilo_to_off_t(SCARG(uap, off_hi),
 						   SCARG(uap, off_lo));
 	return netbsd32_pwritev(l, &ua, retval);
+}