Sun Jul 16 10:20:08 2023 UTC ()
i386: Re-enable HEARTBEAT.


(riastradh)
diff -r1.509 -r1.510 src/sys/arch/i386/conf/ALL
diff -r1.1249 -r1.1250 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.509 -r1.510 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2023/07/16 05:24:08 1.509
+++ src/sys/arch/i386/conf/ALL 2023/07/16 10:20:07 1.510
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.509 2023/07/16 05:24:08 mrg Exp $ 1# $NetBSD: ALL,v 1.510 2023/07/16 10:20:07 riastradh Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.509 $" 20#ident "ALL-$Revision: 1.510 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options USER_LDT # user-settable LDT; used by WINE 27options USER_LDT # user-settable LDT; used by WINE
28options X86EMU # 386 Real Mode emulator 28options X86EMU # 386 Real Mode emulator
29options PAE # PAE mode (36 bits physical addressing) 29options PAE # PAE mode (36 bits physical addressing)
30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
31 # migitation 31 # migitation
32options PCPU_IDT # Per CPU IDT 32options PCPU_IDT # Per CPU IDT
33 33
@@ -121,26 +121,30 @@ options KGDB_DEVNAME="\"com\"",KGDB_DEV @@ -121,26 +121,30 @@ options KGDB_DEVNAME="\"com\"",KGDB_DEV
121makeoptions DEBUG="-g" # compile full symbol table 121makeoptions DEBUG="-g" # compile full symbol table
122options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) 122options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan)
123options SYSCALL_STATS # per syscall counts 123options SYSCALL_STATS # per syscall counts
124options SYSCALL_TIMES # per syscall times 124options SYSCALL_TIMES # per syscall times
125options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) 125options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
126options KDTRACE_HOOKS # kernel DTrace hooks 126options KDTRACE_HOOKS # kernel DTrace hooks
127options UVMHIST # kernhist for uvm subsystem 127options UVMHIST # kernhist for uvm subsystem
128options BIOHIST # kernhist for buff I/O 128options BIOHIST # kernhist for buff I/O
129 129
130# Kernel Code Coverage Driver. 130# Kernel Code Coverage Driver.
131makeoptions KCOV=1 131makeoptions KCOV=1
132options KCOV 132options KCOV
133 133
 134# Heartbeat checks
 135options HEARTBEAT
 136options HEARTBEAT_MAX_PERIOD_DEFAULT=15
 137
134# Compatibility options 138# Compatibility options
135include "conf/compat_netbsd09.config" 139include "conf/compat_netbsd09.config"
136options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI 140options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
137options COMPAT_386BSD_MBRPART # recognize old partition ID 141options COMPAT_386BSD_MBRPART # recognize old partition ID
138 142
139options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility 143options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
140options COMPAT_LINUX # binary compatibility with Linux 144options COMPAT_LINUX # binary compatibility with Linux
141options COMPAT_FREEBSD # binary compatibility with FreeBSD 145options COMPAT_FREEBSD # binary compatibility with FreeBSD
142 146
143# Wedge support 147# Wedge support
144options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances 148options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
145options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges 149options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
146#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges 150#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
cvs diff -r1.1249 -r1.1250 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2023/07/16 05:24:08 1.1249
+++ src/sys/arch/i386/conf/GENERIC 2023/07/16 10:20:07 1.1250
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1249 2023/07/16 05:24:08 mrg Exp $ 1# $NetBSD: GENERIC,v 1.1250 2023/07/16 10:20:07 riastradh Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1249 $" 25#ident "GENERIC-$Revision: 1.1250 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options USER_LDT # user-settable LDT; used by WINE 30options USER_LDT # user-settable LDT; used by WINE
31#options PAE # PAE mode (36 bits physical addressing) 31#options PAE # PAE mode (36 bits physical addressing)
32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
33 # migitation 33 # migitation
34options SPECTRE_V2_GCC_MITIGATION 34options SPECTRE_V2_GCC_MITIGATION
35 35
36# CPU features 36# CPU features
37acpicpu* at cpu? # ACPI CPU (including frequency scaling) 37acpicpu* at cpu? # ACPI CPU (including frequency scaling)
38coretemp* at cpu? # Intel on-die thermal sensor 38coretemp* at cpu? # Intel on-die thermal sensor
@@ -130,26 +130,30 @@ options DDB_HISTORY_SIZE=512 # enable h @@ -130,26 +130,30 @@ options DDB_HISTORY_SIZE=512 # enable h
130#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 130#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
131#makeoptions DEBUG="-g" # compile full symbol table 131#makeoptions DEBUG="-g" # compile full symbol table
132#options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) 132#options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan)
133#options UBSAN_ALWAYS_FATAL # (optional) Panic on all kUBSan reports 133#options UBSAN_ALWAYS_FATAL # (optional) Panic on all kUBSan reports
134#options SYSCALL_STATS # per syscall counts 134#options SYSCALL_STATS # per syscall counts
135#options SYSCALL_TIMES # per syscall times 135#options SYSCALL_TIMES # per syscall times
136#options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) 136#options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris)
137options KDTRACE_HOOKS # kernel DTrace hooks 137options KDTRACE_HOOKS # kernel DTrace hooks
138 138
139# Kernel Code Coverage Driver. 139# Kernel Code Coverage Driver.
140#makeoptions KCOV=1 140#makeoptions KCOV=1
141#options KCOV 141#options KCOV
142 142
 143# Heartbeat checks
 144options HEARTBEAT
 145options HEARTBEAT_MAX_PERIOD_DEFAULT=15
 146
143# Compatibility options 147# Compatibility options
144include "conf/compat_netbsd09.config" 148include "conf/compat_netbsd09.config"
145#options COMPAT_386BSD_MBRPART # recognize old partition ID 149#options COMPAT_386BSD_MBRPART # recognize old partition ID
146 150
147# Wedge support 151# Wedge support
148options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances 152options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
149options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges 153options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
150#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges 154#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
151#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges 155#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
152options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges 156options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
153#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges 157#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
154 158
155# File systems 159# File systems