 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.88 2014/05/29 10:35:26 njoly Exp $
+	$NetBSD: syscalls.master,v 1.88.2.1 2017/04/17 05:19:09 snj Exp $
+;
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD alpha COMPAT_LINUX 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
 @@ -718,27 +718,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.52.2.1 2017/04/17 05:19:09 snj Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD amd64 COMPAT_LINUX 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
 @@ -479,27 +479,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		tee
 	UNIMPL		sync_file_range
 	UNIMPL		vmsplice

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.61.2.1 2017/04/17 05:19:09 snj Exp $
 ; Derived from sys/compat/linux/arch/*/syscalls.master
 ; and from Linux 2.4.12 arch/arm/kernel/calls.S
 ; NetBSD/arm COMPAT_LINUX 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:
 @@ -520,27 +520,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range2
 	UNIMPL		tee
 	UNIMPL		vmsplice

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.118.2.1 2017/04/17 05:19:09 snj Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD i386 COMPAT_LINUX 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
 @@ -493,27 +493,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.88.2.1 2017/04/17 05:19:09 snj Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; NetBSD m68k COMPAT_LINUX 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
 @@ -501,27 +501,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD             { int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \
 			    size_t *len); }
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.56.2.1 2017/04/17 05:19:09 snj Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; Derived from NetBSD's sys/compat/linux/arch/powerpc/syscalls.master
 ; from Linux's arch/mips/kernel/syscalls.h
 ; NetBSD mips COMPAT_LINUX system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Expect problems with
 ;  48 signal: undefined in Linux???
 ;  86 uselib: needs a.out
+;
 @@ -490,27 +490,30 @@
 			    int flag); }
 	NOARGS		{ int|sys||renameat(int fromfd, const char *from, \
 			    int tofd, const char *to); }
 	STD		{ int|linux_sys||linkat(int fd1, const char *name1, \
 			    int fd2, const char *name2, int flags); }
 	NOARGS		{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	NOARGS		{ int|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD		{ int|linux_sys||fchmodat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||faccessat(int fd, const char *path, \
 			    int amode); }
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	UNIMPL		splice
 	UNIMPL		sync_file_range
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	UNIMPL		move_pages
 	STD		{ int|linux_sys||set_robust_list( \
 			    struct linux_robust_list_head *head, size_t len); }
 	STD		{ int|linux_sys||get_robust_list(int pid, \
 			    struct linux_robust_list_head **head, \

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp $
+	$NetBSD: syscalls.master,v 1.65.2.1 2017/04/17 05:19:09 snj Exp $
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; Derived from NetBSD's sys/compat/linux/arch/i386/syscalls.master
 ; sys/compat/linux/arch/m68k/syscalls.master
 ; and from Linux's arch/ppc/kernel/misc.S
+;
 ; We have problems for a few syscalls, specially:
 ; 142 ppc_select -> sys_new_select -> sys_select (Conflicts with 82 ???).
+;
 ; Expect problems with the following, which have an architecture dependent
 ; implementation in Linux/powerpc:
 ; 29  pause
 @@ -467,27 +467,30 @@
 	UNIMPL		mq_getsetattr
 	UNIMPL		kexec_load
 	UNIMPL		add_key
 	UNIMPL		request_key
 	UNIMPL		keyctl
 	UNIMPL		waitid
 	UNIMPL		ioprio_set
 	UNIMPL		ioprio_get
 	UNIMPL		inotify_init
 	UNIMPL		inotify_add_watch
 	UNIMPL		inotify_rm_watch
 	UNIMPL		spu_run
 	UNIMPL		spu_create
-	UNIMPL		pselect6
+	STD		{ int|linux_sys||pselect6(int nfds, fd_set *readfds, \
 			    fd_set *writefds, fd_set *exceptfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sized_sigset_t *ss); }
 	STD		{ int|linux_sys||ppoll(struct pollfd *fds, int nfds, \
 			    struct linux_timespec *timeout, \
 			    linux_sigset_t *sigset); }
 	UNIMPL		unshare
 	UNIMPL		splice
 	UNIMPL		tee
 	UNIMPL		vmsplice
 	STD		{ int|linux_sys||openat(int fd, const char *path, \
 			    int flags, ... linux_umode_t mode); }
 	NOARGS		{ int|sys||mkdirat(int fd, const char *path, \
 			    linux_umode_t mode); }
 	STD		{ int|linux_sys||mknodat(int fd, const char *path, \
 			    linux_umode_t mode, unsigned dev); }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.229 2014/05/29 10:35:27 njoly Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.229.2.1 2017/04/17 05:19:09 snj 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.229 2014/05/29 10:35:27 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.229.2.1 2017/04/17 05:19:09 snj 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>
 @@ -912,26 +912,107 @@ linux_select1(struct lwp *l, register_t
 			if (uts.tv_sec < 0)
 				timespecclear(&uts);
 		} else
 			timespecclear(&uts);
 		ltv.tv_sec = uts.tv_sec;
 		ltv.tv_usec = uts.tv_nsec / 1000;
 		if ((error = copyout(&ltv, timeout, sizeof(ltv))))
 			return error;
+	}
 	return 0;
+}
 /*
  * Derived from FreeBSD's sys/compat/linux/linux_misc.c:linux_pselect6()
  * which was contributed by Dmitry Chagin
  * https://svnweb.freebsd.org/base?view=revision&revision=283403
  */
 int
 linux_sys_pselect6(struct lwp *l,
 	const struct linux_sys_pselect6_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) nfds;
 		syscallarg(fd_set *) readfds;
 		syscallarg(fd_set *) writefds;
 		syscallarg(fd_set *) exceptfds;
 		syscallarg(struct timespec *) timeout;
 		syscallarg(linux_sized_sigset_t *) ss;
 	} */
 	struct timespec uts, ts0, ts1, *tsp;
 	linux_sized_sigset_t lsss;
 	struct linux_timespec lts;
 	linux_sigset_t lss;
 	sigset_t *ssp;
 	sigset_t ss;
 	int error;
 	ssp = NULL;
 	if (SCARG(uap, ss) != NULL) {
 		if ((error = copyin(SCARG(uap, ss), &lsss, sizeof(lsss))) != 0)
 			return (error);
 		if (lsss.ss_len != sizeof(lss))
 			return (EINVAL);
 		if (lsss.ss != NULL) {
 			if ((error = copyin(lsss.ss, &lss, sizeof(lss))) != 0)
 				return (error);
 			linux_to_native_sigset(&ss, &lss);
 			ssp = &ss;
+		}
+	}
 	if (SCARG(uap, timeout) != NULL) {
 		error = copyin(SCARG(uap, timeout), &lts, sizeof(lts));
 		if (error != 0)
 			return (error);
 		linux_to_native_timespec(&uts, &lts);
 		if (itimespecfix(&uts))
 			return (EINVAL);
 		nanotime(&ts0);
 		tsp = &uts;
 	} else {
 		tsp = NULL;
+	}
 	error = selcommon(retval, SCARG(uap, nfds), SCARG(uap, readfds),
 	    SCARG(uap, writefds), SCARG(uap, exceptfds), tsp, ssp);
 	if (error == 0 && tsp != NULL) {
 		if (retval != 0) {
 			/*
 			 * Compute how much time was left of the timeout,
 			 * by subtracting the current time and the time
 			 * before we started the call, and subtracting
 			 * that result from the user-supplied value.
 			 */
 			nanotime(&ts1);
 			timespecsub(&ts1, &ts0, &ts1);
 			timespecsub(&uts, &ts1, &uts);
 			if (uts.tv_sec < 0)
 				timespecclear(&uts);
 		} else {
 			timespecclear(&uts);
+		}
 		native_to_linux_timespec(&lts, &uts);
 		error = copyout(&lts, SCARG(uap, timeout), sizeof(lts));
+	}
 	return (error);
+}
 int
 linux_sys_ppoll(struct lwp *l,
 	const struct linux_sys_ppoll_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct pollfd *) fds;
 		syscallarg(int) nfds;
 		syscallarg(struct linux_timespec *) timeout;
 		syscallarg(linux_sigset_t *) sigset;
 	} */
 	struct linux_timespec lts0, *lts;
 	struct timespec ts0, *ts = NULL;
 	linux_sigset_t lsigmask0, *lsigmask;

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: linux_signal.h,v 1.30 2009/05/29 14:19:13 njoly Exp $	*/
+/* 	$NetBSD: linux_signal.h,v 1.30.38.1 2017/04/17 05:19:09 snj 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,26 +38,31 @@
 #include <compat/linux/arch/m68k/linux_signal.h>
 #elif defined(__alpha__)
 #include <compat/linux/arch/alpha/linux_signal.h>
 #elif defined(__powerpc__)
 #include <compat/linux/arch/powerpc/linux_signal.h>
 #elif defined(__mips__)
 #include <compat/linux/arch/mips/linux_signal.h>
 #elif defined(__arm__)
 #include <compat/linux/arch/arm/linux_signal.h>
 #elif defined(__amd64__)
 #include <compat/linux/arch/amd64/linux_signal.h>
 #endif
 typedef struct {
 	linux_sigset_t *ss;
 	size_t ss_len;
 } linux_sized_sigset_t;
 #ifdef _KERNEL
 extern const int native_to_linux_signo[];
 extern const int linux_to_native_signo[];
 __BEGIN_DECLS
 int linux_sigprocmask1(struct lwp *, int, const linux_old_sigset_t *,
 						linux_old_sigset_t *);
 #if LINUX__NSIG_WORDS > 1
 void linux_old_extra_to_native_sigset(sigset_t *,
     const linux_old_sigset_t *, const unsigned long *);
 void native_to_linux_old_extra_sigset(linux_old_sigset_t *,
     unsigned long *, const sigset_t *);
 #define linux_old_to_native_sigset(x,y) \