Module Name: src
Committed By: maxv
Date: Wed Aug 7 06:28:03 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Sync with reality.
To generate a diff of this commit:
cvs rdiff -u -r1.532 -r1.533 src/sys/arch/amd64/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.532 src/sys/arch/amd64/conf/GENERIC:1.533
--- src/sys/arch/amd64/conf/GENERIC:1.532 Thu Aug 1 13:48:50 2019
+++ src/sys/arch/amd64/conf/GENERIC Wed Aug 7 06:28:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.532 2019/08/01 13:48:50 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.533 2019/08/07 06:28:03 maxv 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.532 $"
+#ident "GENERIC-$Revision: 1.533 $"
maxusers 64 # estimated number of users
@@ -74,15 +74,12 @@ options USERCONF # userconf(4) support
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# CPU-related options
+#options USER_LDT # User-settable LDT, used by Wine
options SVS # Separate Virtual Space
makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
# migitation
options SPECTRE_V2_GCC_MITIGATION
-# USER_LDT. You need to disable SVS to use it.
-#options USER_LDT # user-settable LDT; used by WINE
-#no options SVS
-
# CPU features
acpicpu* at cpu? # ACPI CPU (including frequency scaling)
coretemp* at cpu? # Intel on-die thermal sensor
