Module Name: src
Committed By: pgoyette
Date: Thu Apr 23 23:23:08 UTC 2015
Modified Files:
src/sys/kern: init_main.c
Log Message:
Update initialization of sysmon and its components. These are now handled as
part of module initialization, and do not require manual invocation.
sysmon_taskq is special, since it is potentially used by several non-module
users who may need the facility before modules are fully ready.
To generate a diff of this commit:
cvs rdiff -u -r1.462 -r1.463 src/sys/kern/init_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.462 src/sys/kern/init_main.c:1.463
--- src/sys/kern/init_main.c:1.462 Fri Mar 6 09:28:15 2015
+++ src/sys/kern/init_main.c Thu Apr 23 23:23:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.462 2015/03/06 09:28:15 mrg Exp $ */
+/* $NetBSD: init_main.c,v 1.463 2015/04/23 23:23:08 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.462 2015/03/06 09:28:15 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.463 2015/04/23 23:23:08 pgoyette Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -117,10 +117,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,
#include "drvctl.h"
#include "ksyms.h"
-#include "sysmon_envsys.h"
-#include "sysmon_power.h"
#include "sysmon_taskq.h"
-#include "sysmon_wdog.h"
#include "veriexec.h"
#include <sys/param.h>
@@ -227,10 +224,6 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,
#include <dev/cons.h>
-#if NSYSMON_ENVSYS > 0 || NSYSMON_POWER > 0 || NSYSMON_WDOG > 0
-#include <dev/sysmon/sysmonvar.h>
-#endif
-
#include <net/bpf.h>
#include <net/if.h>
#include <net/raw_cb.h>
@@ -467,23 +460,16 @@ main(void)
/* Initialize kqueue. */
kqueue_init();
- /* Initialize the system monitor subsystems. */
+ /*
+ * Initialize sysmon's task queue. It is used by at
+ * least one non-modularized component (dev/acpica)
+ * and needs to be available early, before the rest
+ * of the module(9) subsystem is ready.
+ */
#if NSYSMON_TASKQ > 0
sysmon_task_queue_preinit();
#endif
-#if NSYSMON_ENVSYS > 0
- sysmon_envsys_init();
-#endif
-
-#if NSYSMON_POWER > 0
- sysmon_power_init();
-#endif
-
-#if NSYSMON_WDOG > 0
- sysmon_wdog_init();
-#endif
-
inittimecounter();
ntp_init();
