Module Name: src
Committed By: riastradh
Date: Sun Jul 16 10:20:08 UTC 2023
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
i386: Re-enable HEARTBEAT.
To generate a diff of this commit:
cvs rdiff -u -r1.509 -r1.510 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1249 -r1.1250 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.509 src/sys/arch/i386/conf/ALL:1.510
--- src/sys/arch/i386/conf/ALL:1.509 Sun Jul 16 05:24:08 2023
+++ src/sys/arch/i386/conf/ALL Sun Jul 16 10:20:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.509 2023/07/16 05:24:08 mrg Exp $
+# $NetBSD: ALL,v 1.510 2023/07/16 10:20:07 riastradh Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.509 $"
+#ident "ALL-$Revision: 1.510 $"
maxusers 64 # estimated number of users
@@ -131,6 +131,10 @@ options BIOHIST # kernhist for buff I/
makeoptions KCOV=1
options KCOV
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
include "conf/compat_netbsd09.config"
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1249 src/sys/arch/i386/conf/GENERIC:1.1250
--- src/sys/arch/i386/conf/GENERIC:1.1249 Sun Jul 16 05:24:08 2023
+++ src/sys/arch/i386/conf/GENERIC Sun Jul 16 10:20:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1249 2023/07/16 05:24:08 mrg Exp $
+# $NetBSD: GENERIC,v 1.1250 2023/07/16 10:20:07 riastradh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1249 $"
+#ident "GENERIC-$Revision: 1.1250 $"
maxusers 64 # estimated number of users
@@ -140,6 +140,10 @@ options KDTRACE_HOOKS # kernel DTrace h
#makeoptions KCOV=1
#options KCOV
+# Heartbeat checks
+options HEARTBEAT
+options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
include "conf/compat_netbsd09.config"
#options COMPAT_386BSD_MBRPART # recognize old partition ID