[src/trunk]: src/sys/arch/i386/conf revert previous change to enable HEARTBEAT.

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

details:   https://anonhg.NetBSD.org/src/rev/0fe024c80527
branches:  trunk
changeset: 377534:0fe024c80527
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 16 05:24:08 2023 +0000

description:
revert previous change to enable HEARTBEAT.

the new code has a "needs 64-bit atomic ops" trigger:

        ci->ci_heartbeat_uptime_cache = atomic_load_relaxed(&time_uptime);

but time_uptime is a 64-bit value, and this trips CTASSERT().

diffstat:

 sys/arch/i386/conf/ALL     |  8 ++------
 sys/arch/i386/conf/GENERIC |  8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r 0c24a1b20fe7 -r 0fe024c80527 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Jul 15 22:30:19 2023 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Jul 16 05:24:08 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.508 2023/07/15 22:13:27 riastradh Exp $
+# $NetBSD: ALL,v 1.509 2023/07/16 05:24:08 mrg 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.508 $"
+#ident         "ALL-$Revision: 1.509 $"
 
 maxusers       64              # estimated number of users
 
@@ -131,10 +131,6 @@ 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
diff -r 0c24a1b20fe7 -r 0fe024c80527 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Jul 15 22:30:19 2023 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Jul 16 05:24:08 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1248 2023/07/15 22:14:39 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1249 2023/07/16 05:24:08 mrg 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.1248 $"
+#ident         "GENERIC-$Revision: 1.1249 $"
 
 maxusers       64              # estimated number of users
 
@@ -140,10 +140,6 @@ 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