 @@ -1,14 +1,14 @@
-/* $NetBSD: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.42.2.1 2018/09/23 17:33:15 martin Exp $ */
 /*
  * Copyright (c) 2004
  * 	Matthias Drochner.  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 @@
  * 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: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.42.2.1 2018/09/23 17:33:15 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/kmem.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/select.h>
 @@ -96,27 +96,26 @@ static const struct fileops drvctl_fileo
 	.fo_read = drvctl_read,
 	.fo_write = drvctl_write,
 	.fo_ioctl = drvctl_ioctl,
 	.fo_fcntl = fnullop_fcntl,
 	.fo_poll = drvctl_poll,
 	.fo_stat = drvctl_stat,
 	.fo_close = drvctl_close,
 	.fo_kqfilter = fnullop_kqfilter,
 	.fo_restart = fnullop_restart,
 };
 #define MAXLOCATORS 100
 extern int (*devmon_insert_vec)(const char *, prop_dictionary_t);
 static int (*saved_insert_vec)(const char *, prop_dictionary_t) = NULL;
 static int drvctl_command(struct lwp *, struct plistref *, u_long, int);
 static int drvctl_getevent(struct lwp *, struct plistref *, u_long, int);
 void
 drvctl_init(void)
+{
 	TAILQ_INIT(&drvctl_eventq);
 	mutex_init(&drvctl_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&drvctl_cond, "devmon");
 	selinit(&drvctl_rdsel);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.253.2.1 2018/09/23 17:33:15 martin Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * 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.
 @@ -67,27 +67,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.
+ *
  * from: Header: subr_autoconf.c,v 1.12 93/02/01 19:31:48 torek Exp  (LBL)
+ *
  *	@(#)subr_autoconf.c	8.3 (Berkeley) 5/17/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.253 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.253.2.1 2018/09/23 17:33:15 martin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "drvctl.h"
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 @@ -182,37 +182,37 @@ static void config_dump_garbage(struct d
 static void pmflock_debug(device_t, const char *, int);
 static device_t deviter_next1(deviter_t *);
 static void deviter_reinit(deviter_t *);
 struct deferred_config {
 	TAILQ_ENTRY(deferred_config) dc_queue;
 	device_t dc_dev;
 	void (*dc_func)(device_t);
 };
 TAILQ_HEAD(deferred_config_head, deferred_config);
-struct deferred_config_head deferred_config_queue =
+static struct deferred_config_head deferred_config_queue =
 	TAILQ_HEAD_INITIALIZER(deferred_config_queue);
-struct deferred_config_head interrupt_config_queue =
+static struct deferred_config_head interrupt_config_queue =
 	TAILQ_HEAD_INITIALIZER(interrupt_config_queue);
-int interrupt_config_threads = 8;
+static int interrupt_config_threads = 8;
-struct deferred_config_head mountroot_config_queue =
+static struct deferred_config_head mountroot_config_queue =
 	TAILQ_HEAD_INITIALIZER(mountroot_config_queue);
-int mountroot_config_threads = 2;
+static int mountroot_config_threads = 2;
 static lwp_t **mountroot_config_lwpids;
 static size_t mountroot_config_lwpids_size;
-static bool root_is_mounted = false;
+bool root_is_mounted = false;
 static void config_process_deferred(struct deferred_config_head *, device_t);
 /* Hooks to finalize configuration once all real devices have been found. */
 struct finalize_hook {
 	TAILQ_ENTRY(finalize_hook) f_list;
 	int (*f_func)(device_t);
 	device_t f_dev;
 };
 static TAILQ_HEAD(, finalize_hook) config_finalize_list =
 	TAILQ_HEAD_INITIALIZER(config_finalize_list);
 static int config_finalize_done;

 @@ -1,14 +1,14 @@
-/* $NetBSD: device.h,v 1.149 2016/06/19 09:35:06 bouyer Exp $ */
+/* $NetBSD: device.h,v 1.149.10.1 2018/09/23 17:33:15 martin Exp $ */
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
  * 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.
 @@ -407,40 +407,42 @@ struct pdevinit {
 /* This allows us to wildcard a device unit. */
 #define	DVUNIT_ANY	-1
 #ifdef _KERNEL
 extern struct cfdriverlist allcfdrivers;/* list of all cfdrivers */
 extern struct cftablelist allcftables;	/* list of all cfdata tables */
 extern device_t booted_device;		/* the device we booted from */
 extern int booted_partition;		/* the partition on that device */
 extern daddr_t booted_startblk;		/* or the start of a wedge */
 extern uint64_t booted_nblks;		/* and the size of that wedge */
 extern char *bootspec;			/* and the device/wedge name */
 extern bool root_is_mounted;		/* true if root is mounted */
 struct vnode *opendisk(device_t);
 int getdisksize(struct vnode *, uint64_t *, unsigned int *);
 struct dkwedge_info;
 int getdiskinfo(struct vnode *, struct dkwedge_info *);
 void	config_init(void);
 int	config_init_component(struct cfdriver *const*,
 			      const struct cfattachinit *, struct cfdata *);
 int	config_fini_component(struct cfdriver *const*,
 			      const struct cfattachinit *, struct cfdata *);
 void	config_init_mi(void);
 void	drvctl_init(void);
 void	drvctl_fini(void);
 extern	int (*devmon_insert_vec)(const char *, prop_dictionary_t);
 int	config_cfdriver_attach(struct cfdriver *);
 int	config_cfdriver_detach(struct cfdriver *);
 int	config_cfattach_attach(const char *, struct cfattach *);
 int	config_cfattach_detach(const char *, struct cfattach *);
 int	config_cfdata_attach(cfdata_t, int);
 int	config_cfdata_detach(cfdata_t);
 struct cfdriver *config_cfdriver_lookup(const char *);
 struct cfattach *config_cfattach_lookup(const char *, const char *);
 const struct cfiattrdata *cfiattr_lookup(const char *, const struct cfdriver *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: systm.h,v 1.272 2016/12/22 16:05:15 cherry Exp $	*/
+/*	$NetBSD: systm.h,v 1.272.8.1 2018/09/23 17:33:15 martin Exp $	*/
 /*-
  * Copyright (c) 1982, 1988, 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:
 @@ -184,34 +184,34 @@ enum hashtype {
 #ifdef _KERNEL
 void	*hashinit(u_int, enum hashtype, bool, u_long *);
 void	hashdone(void *, enum hashtype, u_long);
 int	seltrue(dev_t, int, struct lwp *);
 int	sys_nosys(struct lwp *, const void *, register_t *);
 int	sys_nomodule(struct lwp *, const void *, register_t *);
 void	aprint_normal(const char *, ...) __printflike(1, 2);
 void	aprint_error(const char *, ...) __printflike(1, 2);
 void	aprint_naive(const char *, ...) __printflike(1, 2);
 void	aprint_verbose(const char *, ...) __printflike(1, 2);
 void	aprint_debug(const char *, ...) __printflike(1, 2);
 void	device_printf(device_t, const char *fmt, ...) __printflike(2, 3);
 void	aprint_normal_dev(device_t, const char *, ...) __printflike(2, 3);
 void	aprint_error_dev(device_t, const char *, ...) __printflike(2, 3);
 void	aprint_naive_dev(device_t, const char *, ...) __printflike(2, 3);
 void	aprint_verbose_dev(device_t, const char *, ...) __printflike(2, 3);
 void	aprint_debug_dev(device_t, const char *, ...) __printflike(2, 3);
 void	device_printf(device_t, const char *fmt, ...) __printflike(2, 3);
 struct ifnet;
 void	aprint_normal_ifnet(struct ifnet *, const char *, ...)
     __printflike(2, 3);
 void	aprint_error_ifnet(struct ifnet *, const char *, ...)
     __printflike(2, 3);
 void	aprint_naive_ifnet(struct ifnet *, const char *, ...)
     __printflike(2, 3);
 void	aprint_verbose_ifnet(struct ifnet *, const char *, ...)
     __printflike(2, 3);
 void	aprint_debug_ifnet(struct ifnet *, const char *, ...)
     __printflike(2, 3);