Module Name: src
Committed By: riastradh
Date: Sat Jul 15 22:14:39 UTC 2023
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
x86: Enable HEARTBEAT by default in GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.602 -r1.603 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1247 -r1.1248 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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.602 src/sys/arch/amd64/conf/GENERIC:1.603
--- src/sys/arch/amd64/conf/GENERIC:1.602 Wed Apr 12 06:39:15 2023
+++ src/sys/arch/amd64/conf/GENERIC Sat Jul 15 22:14:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.602 2023/04/12 06:39:15 riastradh Exp $
+# $NetBSD: GENERIC,v 1.603 2023/07/15 22:14:39 riastradh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.602 $"
+#ident "GENERIC-$Revision: 1.603 $"
maxusers 64 # estimated number of users
@@ -171,6 +171,10 @@ options KDTRACE_HOOKS # kernel DTrace h
# Fault Injection Driver.
#options FAULT
+# Heartbeat checks
+#options HEARTBEAT
+#options HEARTBEAT_MAX_PERIOD_DEFAULT=15
+
# Compatibility options
# x86_64 never shipped with a.out binaries; the two options below are
# only relevant to 32-bit i386 binaries
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1247 src/sys/arch/i386/conf/GENERIC:1.1248
--- src/sys/arch/i386/conf/GENERIC:1.1247 Mon May 22 16:28:34 2023
+++ src/sys/arch/i386/conf/GENERIC Sat Jul 15 22:14:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1247 2023/05/22 16:28:34 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1248 2023/07/15 22:14:39 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.1247 $"
+#ident "GENERIC-$Revision: 1.1248 $"
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
