 @@ -1,14 +1,14 @@
-/*	$NetBSD: limits.h,v 1.36 2016/03/08 05:02:55 christos Exp $	*/
+/*	$NetBSD: limits.h,v 1.37 2016/06/10 23:24:33 christos Exp $	*/
 /*
  * Copyright (c) 1988, 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.
 @@ -83,26 +83,27 @@
 #define	_POSIX_THREAD_THREADS_MAX		64
 /*
  * These are the correct names, defined in terms of the above
  * except for PTHREAD_KEYS_MAX which is bigger than standard
  * mandated minimum value _POSIX_THREAD_KEYS_MAX.
  */
 #define	PTHREAD_DESTRUCTOR_ITERATIONS 	_POSIX_THREAD_DESTRUCTOR_ITERATIONS
 #define	PTHREAD_KEYS_MAX		256
 /* Not yet: PTHREAD_STACK_MIN */
 #define	PTHREAD_THREADS_MAX		_POSIX_THREAD_THREADS_MAX
 #define	_POSIX_TIMER_MAX	32
 #define	_POSIX_SEM_NSEMS_MAX	256
 #define	_POSIX_TTY_NAME_MAX	9
 #define	_POSIX_TZNAME_MAX	6
 #define	_POSIX2_BC_BASE_MAX	99
 #define	_POSIX2_BC_DIM_MAX	2048
 #define	_POSIX2_BC_SCALE_MAX	99
 #define	_POSIX2_BC_STRING_MAX	1000
 #define	_POSIX2_CHARCLASS_NAME_MAX	14
 #define	_POSIX2_COLL_WEIGHTS_MAX	2
 #define	_POSIX2_EXPR_NEST_MAX	32
 #define	_POSIX2_LINE_MAX	2048
 #define	_POSIX2_RE_DUP_MAX	255

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: sysconf.3,v 1.45 2016/02/26 17:13:01 christos Exp $
+.\"	$NetBSD: sysconf.3,v 1.46 2016/06/10 23:24:33 christos Exp $
 .\"
 .\" Copyright (c) 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.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -139,26 +139,29 @@ Read-Write Locks
 option to which the system attempts to conform,
 otherwise \-1.
 .It Li _SC_REGEXP
 Return 1 if
 .Tn POSIX
 regular expressions are available on this system, otherwise \-1.
 .It Li _SC_SEMAPHORES
 The version of
 .St -p1003.1
 and its
 Semaphores
 option to which the system attempts to conform,
 otherwise \-1.
 .It Li _SC_SEM_NSEMS_MAX
 The maximum number of semaphores that one process can have open at a time,
 otherwise \-1.
 .It Li _SC_SHELL
 Return 1 if
 .Tn POSIX
 shell is available on this system, otherwise \-1.
 .It Li _SC_SPIN_LOCKS
 The version of
 .St -p1003.1
 and its
 Spin Locks
 option to which the system attempts to conform,
 otherwise \-1.
 .It Li _SC_STREAM_MAX
 The minimum maximum number of streams that a process may have open

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysconf.c,v 1.37 2016/02/26 17:13:01 christos Exp $	*/
+/*	$NetBSD: sysconf.c,v 1.38 2016/06/10 23:24:33 christos Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Sean Eric Fagan of Cygnus Support.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
 #else
-__RCSID("$NetBSD: sysconf.c,v 1.37 2016/02/26 17:13:01 christos Exp $");
+__RCSID("$NetBSD: sysconf.c,v 1.38 2016/06/10 23:24:33 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <errno.h>
 #include <limits.h>
 #include <time.h>
 #include <unistd.h>
 @@ -410,19 +410,21 @@ yesno:		if (sysctl(mib, mib_len, &value,
 	case _SC_THREAD_ATTR_STACKSIZE:
 		return _POSIX_THREAD_ATTR_STACKSIZE;
 	case _SC_THREAD_SAFE_FUNCTIONS:
 		return _POSIX_THREAD_SAFE_FUNCTIONS;
 	case _SC_THREAD_PRIORITY_SCHEDULING:
 	case _SC_THREAD_PRIO_INHERIT:
 	case _SC_THREAD_PRIO_PROTECT:
 	case _SC_THREAD_PROCESS_SHARED:
 		return -1;
 	case _SC_TTY_NAME_MAX:
 		return pathconf(_PATH_DEV, _PC_NAME_MAX);
 	case _SC_TIMER_MAX:
 		return _POSIX_TIMER_MAX;
 	case _SC_SEM_NSEMS_MAX:
 		return _POSIX_SEM_NSEMS_MAX;
 	default:
 		errno = EINVAL;
 		return (-1);
+	}
 	return (sysctl(mib, mib_len, &value, &len, NULL, 0) == -1 ? -1 : value);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_sem.c,v 1.45 2016/04/24 19:48:29 dholland Exp $	*/
+/*	$NetBSD: uipc_sem.c,v 1.46 2016/06/10 23:24:33 christos Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius.
+ *
  * 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.
 @@ -50,53 +50,54 @@
  * 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.
  */
 /*
  * Implementation of POSIX semaphore.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.45 2016/04/24 19:48:29 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.46 2016/06/10 23:24:33 christos Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
 #include <sys/ksem.h>
 #include <sys/syscall.h>
 #include <sys/stat.h>
 #include <sys/kmem.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/semaphore.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <sys/syscallvar.h>
 #include <sys/sysctl.h>
 MODULE(MODULE_CLASS_MISC, ksem, NULL);
 #define	SEM_MAX_NAMELEN		14
 #define	SEM_NSEMS_MAX		256
 #define	KS_UNLINKED		0x01
 static kmutex_t		ksem_lock	__cacheline_aligned;
 static LIST_HEAD(,ksem)	ksem_head	__cacheline_aligned;
 static u_int		nsems_total	__cacheline_aligned;
 static u_int		nsems		__cacheline_aligned;
 static kauth_listener_t	ksem_listener;
 static int		ksem_sysinit(void);
 static int		ksem_sysfini(bool);
 static int		ksem_modcmd(modcmd_t, void *);
 static int		ksem_close_fop(file_t *);
 @@ -323,26 +324,31 @@ ksem_create(lwp_t *l, const char *name,
 			return ENAMETOOLONG;
+		}
 		/* Name must start with a '/' but not contain one. */
 		if (*name != '/' || len < 2 || strchr(name + 1, '/') != NULL) {
 			return EINVAL;
+		}
 		kname = kmem_alloc(++len, KM_SLEEP);
 		strlcpy(kname, name, len);
 	} else {
 		kname = NULL;
 		len = 0;
+	}
 	if (atomic_inc_uint_nv(&l->l_proc->p_nsems) > SEM_NSEMS_MAX) {
                atomic_dec_uint(&l->l_proc->p_nsems);
 		return -1;
+       }
 	ks = kmem_zalloc(sizeof(ksem_t), KM_SLEEP);
 	mutex_init(&ks->ks_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&ks->ks_cv, "psem");
 	ks->ks_name = kname;
 	ks->ks_namelen = len;
 	ks->ks_mode = mode;
 	ks->ks_value = val;
 	ks->ks_ref = 1;
 	uc = l->l_cred;
 	ks->ks_uid = kauth_cred_geteuid(uc);
 	ks->ks_gid = kauth_cred_getegid(uc);
 @@ -356,26 +362,27 @@ ksem_free(ksem_t *ks)
+{
 	KASSERT(!cv_has_waiters(&ks->ks_cv));
 	if (ks->ks_name) {
 		KASSERT(ks->ks_namelen > 0);
 		kmem_free(ks->ks_name, ks->ks_namelen);
+	}
 	mutex_destroy(&ks->ks_lock);
 	cv_destroy(&ks->ks_cv);
 	kmem_free(ks, sizeof(ksem_t));
 	atomic_dec_uint(&nsems_total);
  	atomic_dec_uint(&curproc->p_nsems);
+}
 int
 sys__ksem_init(struct lwp *l, const struct sys__ksem_init_args *uap,
     register_t *retval)
+{
 	/* {
 		unsigned int value;
 		intptr_t *idp;
 	} */
 	return do_ksem_init(l, SCARG(uap, value), SCARG(uap, idp), copyout);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: proc.h,v 1.330 2016/04/27 21:15:40 christos Exp $	*/
+/*	$NetBSD: proc.h,v 1.331 2016/06/10 23:24:33 christos Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * 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.
 @@ -295,26 +295,27 @@ struct proc {
 	void		*p_tracep;	/* k: Trace private data */
 	struct vnode 	*p_textvp;	/* :: Vnode of executable */
 	struct emul	*p_emul;	/* :: emulation information */
 	void		*p_emuldata;	/* :: per-proc emul data, or NULL */
 	const struct execsw *p_execsw;	/* :: exec package information */
 	struct klist	p_klist;	/* p: knotes attached to proc */
 	LIST_HEAD(, lwp) p_sigwaiters;	/* p: LWPs waiting for signals */
 	sigpend_t	p_sigpend;	/* p: pending signals */
 	struct lcproc	*p_lwpctl;	/* p, a: _lwp_ctl() information */
 	pid_t		p_ppid;		/* :: cached parent pid */
 	pid_t 		p_fpid;		/* :: forked pid */
 	u_int		p_nsems;	/* Count of semaphores */
 /*
  * End area that is zeroed on creation
  */
 #define	p_endzero	p_startcopy
 /*
  * The following fields are all copied upon creation in fork.
  */
 #define	p_startcopy	p_sigctx
 	struct sigctx 	p_sigctx;	/* p: Shared signal state */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: unistd.h,v 1.56 2016/02/26 17:10:41 christos Exp $	*/
+/*	$NetBSD: unistd.h,v 1.57 2016/06/10 23:24:33 christos Exp $	*/
 /*
  * Copyright (c) 1989, 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.
 @@ -298,27 +298,27 @@
 #define	_SC_V6_LPBIG_OFFBIG		77
 #define	_SC_2_PBS			80
 #define	_SC_2_PBS_ACCOUNTING		81
 #define	_SC_2_PBS_CHECKPOINT		82
 #define	_SC_2_PBS_LOCATE		83
 #define	_SC_2_PBS_MESSAGE		84
 #define	_SC_2_PBS_TRACK			85
 /* These are implemented */
 #define	_SC_SPAWN			86
 #define	_SC_SHARED_MEMORY_OBJECTS	87
 #define	_SC_TIMER_MAX			88
 #define	_SC_SEM_NSEMS_MAX		89
 /* Extensions found in Solaris and Linux. */
 #define	_SC_PHYS_PAGES		121
 #ifdef _NETBSD_SOURCE
 /* Commonly provided sysconf() extensions */
 #define	_SC_NPROCESSORS_CONF	1001
 #define	_SC_NPROCESSORS_ONLN	1002
 /* Native variables */
 #define	_SC_SCHED_RT_TS		2001
 #define	_SC_SCHED_PRI_MIN	2002
 #define	_SC_SCHED_PRI_MAX	2003
 #endif	/* _NETBSD_SOURCE */