Sun Aug 30 11:16:17 2020 UTC ()
typo in comment


(dholland)
diff -r1.577 -r1.578 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.577 -r1.578 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2020/08/17 20:43:13 1.577
+++ src/sys/arch/amd64/conf/GENERIC 2020/08/30 11:16:17 1.578
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.577 2020/08/17 20:43:13 christos Exp $ 1# $NetBSD: GENERIC,v 1.578 2020/08/30 11:16:17 dholland 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/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
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.577 $" 25#ident "GENERIC-$Revision: 1.578 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -68,27 +68,27 @@ options SYSVSEM # System V-like semaph @@ -68,27 +68,27 @@ options SYSVSEM # System V-like semaph
68options SYSVSHM # System V-like memory sharing 68options SYSVSHM # System V-like memory sharing
69 69
70options MODULAR # new style module(7) framework 70options MODULAR # new style module(7) framework
71options MODULAR_DEFAULT_AUTOLOAD 71options MODULAR_DEFAULT_AUTOLOAD
72options USERCONF # userconf(4) support 72options USERCONF # userconf(4) support
73#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 73#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
74options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 74options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
75 75
76# CPU-related options 76# CPU-related options
77options USER_LDT # User-settable LDT, used by Wine 77options USER_LDT # User-settable LDT, used by Wine
78options SVS # Separate Virtual Space 78options SVS # Separate Virtual Space
79options PCPU_IDT # Per CPU IDTs 79options PCPU_IDT # Per CPU IDTs
80 80
81# GCC Spectre variant 2 migitation 81# GCC Spectre variant 2 mitigation
82makeoptions SPECTRE_V2_GCC_MITIGATION=1 82makeoptions SPECTRE_V2_GCC_MITIGATION=1
83options SPECTRE_V2_GCC_MITIGATION 83options SPECTRE_V2_GCC_MITIGATION
84 84
85# CPU features 85# CPU features
86acpicpu* at cpu? # ACPI CPU (including frequency scaling) 86acpicpu* at cpu? # ACPI CPU (including frequency scaling)
87coretemp* at cpu? # Intel on-die thermal sensor 87coretemp* at cpu? # Intel on-die thermal sensor
88est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 88est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
89hyperv0 at cpu0 # Microsoft Hyper-V 89hyperv0 at cpu0 # Microsoft Hyper-V
90#odcm0 at cpu0 # On-demand clock modulation 90#odcm0 at cpu0 # On-demand clock modulation
91powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) 91powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
92vmt0 at cpu0 # VMware Tools 92vmt0 at cpu0 # VMware Tools
93 93
94#Xen PV support for HVM guests 94#Xen PV support for HVM guests