summaryrefslogtreecommitdiff
path: root/sys/kern/init_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/init_main.c')
-rw-r--r--sys/kern/init_main.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index f0428ad570f..1d2dbd742fe 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.541 2022/10/26 23:20:47 riastradh Exp $ */
+/* $NetBSD: init_main.c,v 1.542 2023/07/07 12:34:50 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,10 +97,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.541 2022/10/26 23:20:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.542 2023/07/07 12:34:50 riastradh Exp $");
#include "opt_cnmagic.h"
#include "opt_ddb.h"
+#include "opt_heartbeat.h"
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_modular.h"
@@ -199,6 +200,7 @@ extern void *_binary_splash_image_end;
#include <sys/cprng.h>
#include <sys/psref.h>
#include <sys/radixtree.h>
+#include <sys/heartbeat.h>
#include <sys/syscall.h>
#include <sys/syscallargs.h>
@@ -557,6 +559,14 @@ main(void)
/* Once all CPUs are detected, initialize the per-CPU cprng_fast. */
cprng_fast_init();
+#ifdef HEARTBEAT
+ /*
+ * Now that softints can be established, start monitoring
+ * system heartbeat on all CPUs.
+ */
+ heartbeat_start();
+#endif
+
ssp_init();
ubc_init(); /* must be after autoconfig */