[src/netbsd-8]: src/sys Pull up following revision(s) (requested by mrg in ti...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b1ffc62b80eb
branches:  netbsd-8
changeset: 435264:b1ffc62b80eb
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 23 17:33:15 2018 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1025):

        sys/kern/subr_autoconf.c: revision 1.263
        sys/kern/kern_drvctl.c: revision 1.44
        sys/sys/device.h: revision 1.156
        sys/sys/systm.h: revision 1.278

- move export for devmon_insert_vec into sys/device.h.
- export root_is_mounted for future USB RB_ASKNAME hack.
- make some things in subr_autoconf.c static
- move device_printf() prototype out from the middle of two sets of
  aprint_*() prototypes.

diffstat:

 sys/kern/kern_drvctl.c   |   5 ++---
 sys/kern/subr_autoconf.c |  16 ++++++++--------
 sys/sys/device.h         |   4 +++-
 sys/sys/systm.h          |   6 +++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs (119 lines):

diff -r e31272552bf9 -r b1ffc62b80eb sys/kern/kern_drvctl.c
--- a/sys/kern/kern_drvctl.c    Sun Sep 23 17:28:25 2018 +0000
+++ b/sys/kern/kern_drvctl.c    Sun Sep 23 17:33:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $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
@@ -27,7 +27,7 @@
  */
 
 #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>
@@ -106,7 +106,6 @@
 
 #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);
diff -r e31272552bf9 -r b1ffc62b80eb sys/kern/subr_autoconf.c
--- a/sys/kern/subr_autoconf.c  Sun Sep 23 17:28:25 2018 +0000
+++ b/sys/kern/subr_autoconf.c  Sun Sep 23 17:33:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $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
@@ -77,7 +77,7 @@
  */
 
 #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"
@@ -192,17 +192,17 @@
 
 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;
-struct deferred_config_head mountroot_config_queue =
+static int interrupt_config_threads = 8;
+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);
 
diff -r e31272552bf9 -r b1ffc62b80eb sys/sys/device.h
--- a/sys/sys/device.h  Sun Sep 23 17:28:25 2018 +0000
+++ b/sys/sys/device.h  Sun Sep 23 17:33:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $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
@@ -417,6 +417,7 @@
 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 *);
@@ -431,6 +432,7 @@
 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 *);
diff -r e31272552bf9 -r b1ffc62b80eb sys/sys/systm.h
--- a/sys/sys/systm.h   Sun Sep 23 17:28:25 2018 +0000
+++ b/sys/sys/systm.h   Sun Sep 23 17:33:15 2018 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -194,14 +194,14 @@
 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 *, ...)