Module Name: src
Committed By: maxv
Date: Sun Oct 7 08:00:49 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Make it clear that you need to disable SVS if you enable USER_LDT. I could
make SVS compatible with it, but there has to be someone doing Wine work
first, to justify the effort.
To generate a diff of this commit:
cvs rdiff -u -r1.505 -r1.506 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.505 src/sys/arch/amd64/conf/GENERIC:1.506
--- src/sys/arch/amd64/conf/GENERIC:1.505 Thu Sep 6 05:36:49 2018
+++ src/sys/arch/amd64/conf/GENERIC Sun Oct 7 08:00:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.505 2018/09/06 05:36:49 maxv Exp $
+# $NetBSD: GENERIC,v 1.506 2018/10/07 08:00:49 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.505 $"
+#ident "GENERIC-$Revision: 1.506 $"
maxusers 64 # estimated number of users
@@ -74,12 +74,15 @@ 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
