 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_condvar.c,v 1.39 2017/11/12 20:04:51 riastradh Exp $	*/
+/*	$NetBSD: kern_condvar.c,v 1.40 2017/12/25 09:13:40 ozaki-r 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.
 @@ -24,27 +24,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.
  */
 /*
  * Kernel condition variable implementation.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.39 2017/11/12 20:04:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.40 2017/12/25 09:13:40 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lwp.h>
 #include <sys/condvar.h>
 #include <sys/sleepq.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 /*
  * Accessors for the private contents of the kcondvar_t data type.
+ *
 @@ -69,29 +69,29 @@ __KERNEL_RCSID(0, "$NetBSD: kern_condvar
 static void		cv_unsleep(lwp_t *, bool);
 static inline void	cv_wakeup_one(kcondvar_t *);
 static inline void	cv_wakeup_all(kcondvar_t *);
 static syncobj_t cv_syncobj = {
 	SOBJ_SLEEPQ_SORTED,
 	cv_unsleep,
 	sleepq_changepri,
 	sleepq_lendpri,
 	syncobj_noowner,
 };
 lockops_t cv_lockops = {
-	"Condition variable",
+	.lo_name = "Condition variable",
-	LOCKOPS_CV,
+	.lo_type = LOCKOPS_CV,
-	NULL
+	.lo_dump = NULL,
 };
 static const char deadcv[] = "deadcv";
 #ifdef LOCKDEBUG
 static const char nodebug[] = "nodebug";
 #define CV_LOCKDEBUG_HANDOFF(l, cv) cv_lockdebug_handoff(l, cv)
 #define CV_LOCKDEBUG_PROCESS(l, cv) cv_lockdebug_process(l, cv)
 static inline void
 cv_lockdebug_handoff(lwp_t *l, kcondvar_t *cv)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_lock.c,v 1.160 2017/11/21 08:49:14 ozaki-r Exp $	*/
+/*	$NetBSD: kern_lock.c,v 1.161 2017/12/25 09:13:40 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 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, 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
 @@ -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: kern_lock.c,v 1.160 2017/11/21 08:49:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.161 2017/12/25 09:13:40 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/syslog.h>
 #include <sys/atomic.h>
 #include <sys/lwp.h>
 #include <sys/pserialize.h>
 @@ -110,29 +110,29 @@ assert_sleepable(void)
 #ifdef LOCKDEBUG
 #define	_KERNEL_LOCK_ASSERT(cond)					\
 do {									\
 	if (!(cond))							\
 		_KERNEL_LOCK_ABORT("assertion failed: " #cond);		\
 } while (/* CONSTCOND */ 0)
 #else
 #define	_KERNEL_LOCK_ASSERT(cond)	/* nothing */
 #endif
 void	_kernel_lock_dump(const volatile void *);
 lockops_t _kernel_lock_ops = {
-	"Kernel lock",
+	.lo_name = "Kernel lock",
-	LOCKOPS_SPIN,
+	.lo_type = LOCKOPS_SPIN,
-	_kernel_lock_dump
+	.lo_dump = _kernel_lock_dump,
 };
 /*
  * Initialize the kernel lock.
  */
 void
 kernel_lock_init(void)
+{
 	__cpu_simple_lock_init(kernel_lock);
 	kernel_lock_dodebug = LOCKDEBUG_ALLOC(kernel_lock, &_kernel_lock_ops,
 	    RETURN_ADDRESS);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_mutex.c,v 1.67 2017/09/16 23:55:33 christos Exp $	*/
+/*	$NetBSD: kern_mutex.c,v 1.68 2017/12/25 09:13:40 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and 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.
 @@ -30,27 +30,27 @@
  */
 /*
  * Kernel mutex implementation, modeled after those found in Solaris,
  * a description of which can be found in:
+ *
  *	Solaris Internals: Core Kernel Architecture, Jim Mauro and
  *	    Richard McDougall.
  */
 #define	__MUTEX_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.67 2017/09/16 23:55:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.68 2017/12/25 09:13:40 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/sched.h>
 #include <sys/sleepq.h>
 #include <sys/systm.h>
 #include <sys/lockdebug.h>
 #include <sys/kernel.h>
 #include <sys/intr.h>
 #include <sys/lock.h>
 #include <sys/types.h>
 @@ -259,35 +259,35 @@ __strong_alias(mutex_enter,mutex_vector_
 __strong_alias(mutex_exit,mutex_vector_exit);
 #endif
 #ifndef __HAVE_SPIN_MUTEX_STUBS
 __strong_alias(mutex_spin_enter,mutex_vector_enter);
 __strong_alias(mutex_spin_exit,mutex_vector_exit);
 #endif
 static void	mutex_abort(const char *, size_t, const kmutex_t *,
     const char *);
 static void	mutex_dump(const volatile void *);
 lockops_t mutex_spin_lockops = {
-	"Mutex",
+	.lo_name = "Mutex",
-	LOCKOPS_SPIN,
+	.lo_type = LOCKOPS_SPIN,
-	mutex_dump
+	.lo_dump = mutex_dump,
 };
 lockops_t mutex_adaptive_lockops = {
-	"Mutex",
+	.lo_name = "Mutex",
-	LOCKOPS_SLEEP,
+	.lo_type = LOCKOPS_SLEEP,
-	mutex_dump
+	.lo_dump = mutex_dump,
 };
 syncobj_t mutex_syncobj = {
 	SOBJ_SLEEPQ_SORTED,
 	turnstile_unsleep,
 	turnstile_changepri,
 	sleepq_lendpri,
 	(void *)mutex_owner,
 };
 /*
  * mutex_dump:
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_rwlock.c,v 1.47 2017/09/16 23:55:33 christos Exp $	*/
+/*	$NetBSD: kern_rwlock.c,v 1.48 2017/12/25 09:13:40 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe and 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.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Kernel reader/writer lock implementation, modeled after those
  * found in Solaris, a description of which can be found in:
+ *
  *	Solaris Internals: Core Kernel Architecture, Jim Mauro and
  *	    Richard McDougall.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.47 2017/09/16 23:55:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.48 2017/12/25 09:13:40 ozaki-r Exp $");
 #define	__RWLOCK_PRIVATE
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/sched.h>
 #include <sys/sleepq.h>
 #include <sys/systm.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/atomic.h>
 #include <sys/lock.h>
 @@ -138,29 +138,29 @@ rw_swap(krwlock_t *rw, uintptr_t o, uint
  * For platforms that do not provide stubs, or for the LOCKDEBUG case.
  */
 #ifdef LOCKDEBUG
 #undef	__HAVE_RW_STUBS
 #endif
 #ifndef __HAVE_RW_STUBS
 __strong_alias(rw_enter,rw_vector_enter);
 __strong_alias(rw_exit,rw_vector_exit);
 __strong_alias(rw_tryenter,rw_vector_tryenter);
 #endif
 lockops_t rwlock_lockops = {
-	"Reader / writer lock",
+	.lo_name = "Reader / writer lock",
-	LOCKOPS_SLEEP,
+	.lo_type = LOCKOPS_SLEEP,
-	rw_dump
+	.lo_dump = rw_dump,
 };
 syncobj_t rw_syncobj = {
 	SOBJ_SLEEPQ_SORTED,
 	turnstile_unsleep,
 	turnstile_changepri,
 	sleepq_lendpri,
 	rw_owner,
 };
 /*
  * rw_dump:
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locks.c,v 1.75 2017/09/17 05:47:19 kre Exp $	*/
+/*	$NetBSD: locks.c,v 1.76 2017/12/25 09:13:40 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  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,59 +16,59 @@
  * 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: locks.c,v 1.75 2017/09/17 05:47:19 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.76 2017/12/25 09:13:40 ozaki-r Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <rump-sys/kern.h>
 #include <rump/rumpuser.h>
 #ifdef LOCKDEBUG
 const int rump_lockdebug = 1;
 #else
 const int rump_lockdebug = 0;
 #endif
 /*
  * Simple lockdebug.  If it's compiled in, it's always active.
  * Currently available only for mtx/rwlock.
  */
 #ifdef LOCKDEBUG
 #include <sys/lockdebug.h>
 static lockops_t mutex_lockops = {
-	"mutex",
+	.lo_name = "mutex",
-	LOCKOPS_SLEEP,
+	.lo_type = LOCKOPS_SLEEP,
-	NULL
+	.lo_dump = NULL,
 };
 static lockops_t rw_lockops = {
-	"rwlock",
+	.lo_name = "rwlock",
-	LOCKOPS_SLEEP,
+	.lo_type = LOCKOPS_SLEEP,
-	NULL
+	.lo_dump = NULL,
 };
 #define ALLOCK(lock, ops)				\
     lockdebug_alloc(__func__, __LINE__, lock, ops,	\
     (uintptr_t)__builtin_return_address(0))
 #define FREELOCK(lock)			\
     lockdebug_free(__func__, __LINE__, lock)
 #define WANTLOCK(lock, shar)				\
     lockdebug_wantlock(__func__, __LINE__, lock,	\
     (uintptr_t)__builtin_return_address(0), shar)
 #define LOCKED(lock, shar)				\
     lockdebug_locked(__func__, __LINE__, lock, NULL,	\
     (uintptr_t)__builtin_return_address(0), shar)