 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.458.2.1 2014/08/15 12:58:45 martin Exp $	*/
+/*	$NetBSD: init_main.c,v 1.458.2.2 2015/03/09 08:56:01 snj Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * 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.
 @@ -87,27 +87,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.458.2.1 2014/08/15 12:58:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.458.2.2 2015/03/09 08:56:01 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_compat_netbsd.h"
 #include "opt_wapbl.h"
 @@ -702,26 +702,29 @@ main(void)
 	    NULL, NULL, "pgdaemon"))
 		panic("fork pagedaemon");
 	/* Create the filesystem syncer kernel thread. */
 	if (kthread_create(PRI_IOFLUSH, KTHREAD_MPSAFE, NULL, sched_sync,
 	    NULL, NULL, "ioflush"))
 		panic("fork syncer");
 	/* Create the aiodone daemon kernel thread. */
 	if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 	    uvm_aiodone_worker, NULL, PRI_VM, IPL_NONE, WQ_MPSAFE))
 		panic("fork aiodoned");
 	/* Wait for final configure threads to complete. */
 	config_finalize_mountroot();
 	/*
 	 * Okay, now we can let init(8) exec!  It's off to userland!
 	 */
 	mutex_enter(proc_lock);
 	start_init_exec = 1;
 	cv_broadcast(&lbolt);
 	mutex_exit(proc_lock);
 	/* The scheduler is an infinite loop. */
 	uvm_scheduler();
 	/* NOTREACHED */
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: subr_autoconf.c,v 1.231 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.231.2.1 2015/03/09 08:56:01 snj 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.231 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.1 2015/03/09 08:56:01 snj 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>
 @@ -192,26 +192,28 @@ struct deferred_config {
 	void (*dc_func)(device_t);
 };
 TAILQ_HEAD(deferred_config_head, deferred_config);
 struct deferred_config_head deferred_config_queue =
 	TAILQ_HEAD_INITIALIZER(deferred_config_queue);
 struct deferred_config_head interrupt_config_queue =
 	TAILQ_HEAD_INITIALIZER(interrupt_config_queue);
 int interrupt_config_threads = 8;
 struct deferred_config_head mountroot_config_queue =
 	TAILQ_HEAD_INITIALIZER(mountroot_config_queue);
 int mountroot_config_threads = 2;
 static lwp_t **mountroot_config_lwpids;
 static size_t mountroot_config_lwpids_size;
 static 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;
 @@ -471,30 +473,55 @@ config_mountroot_thread(void *cookie)
 		kmem_free(dc, sizeof(*dc));
+	}
 	kthread_exit(0);
+}
 void
 config_create_mountrootthreads(void)
+{
 	int i;
 	if (!root_is_mounted)
 		root_is_mounted = true;
 	mountroot_config_lwpids_size = sizeof(mountroot_config_lwpids) *
 				       mountroot_config_threads;
 	mountroot_config_lwpids = kmem_alloc(mountroot_config_lwpids_size,
 					     KM_NOSLEEP);
 	KASSERT(mountroot_config_lwpids);
 	for (i = 0; i < mountroot_config_threads; i++) {
-		(void)kthread_create(PRI_NONE, 0, NULL,
+		mountroot_config_lwpids[i] = 0;
-		    config_mountroot_thread, NULL, NULL, "configroot");
+		(void)kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL,
 				     config_mountroot_thread, NULL,
 				     &mountroot_config_lwpids[i],
 				     "configroot");
+	}
+}
 void
 config_finalize_mountroot(void)
+{
 	int i, error;
 	for (i = 0; i < mountroot_config_threads; i++) {
 		if (mountroot_config_lwpids[i] == 0)
 			continue;
 		error = kthread_join(mountroot_config_lwpids[i]);
 		if (error)
 			printf("%s: thread %x joined with error %d\n",
 			       __func__, i, error);
+	}
 	kmem_free(mountroot_config_lwpids, mountroot_config_lwpids_size);
+}
 /*
  * Announce device attach/detach to userland listeners.
  */
 static void
 devmon_report_device(device_t dev, bool isattach)
+{
 #if NDRVCTL > 0
 	prop_dictionary_t ev;
 	const char *parent;
 	const char *what;
 	device_t pdev = device_parent(dev);

 @@ -1,14 +1,14 @@
-/* $NetBSD: device.h,v 1.144 2013/10/12 16:49:01 christos Exp $ */
+/* $NetBSD: device.h,v 1.144.4.1 2015/03/09 08:56:02 snj 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.
 @@ -466,26 +466,27 @@ int	config_detach_children(device_t, int
 bool	config_detach_all(int);
 int	config_deactivate(device_t);
 void	config_defer(device_t, void (*)(device_t));
 void	config_deferred(device_t);
 void	config_interrupts(device_t, void (*)(device_t));
 void	config_mountroot(device_t, void (*)(device_t));
 void	config_pending_incr(device_t);
 void	config_pending_decr(device_t);
 void	config_create_interruptthreads(void);
 void	config_create_mountrootthreads(void);
 int	config_finalize_register(device_t, int (*)(device_t));
 void	config_finalize(void);
 void	config_finalize_mountroot(void);
 void	config_twiddle_init(void);
 void	config_twiddle_fn(void *);
 void	null_childdetached(device_t, device_t);
 device_t	device_lookup(cfdriver_t, int);
 void		*device_lookup_private(cfdriver_t, int);
 void		device_register(device_t, void *);
 void		device_register_post_config(device_t, void *);
 devclass_t	device_class(device_t);
 cfdata_t	device_cfdata(device_t);