[src/trunk]: src/sys/arch/amd64/conf Sync with reality.

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

details:   https://anonhg.NetBSD.org/src/rev/ca14a9d86b7c
branches:  trunk
changeset: 458682:ca14a9d86b7c
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Aug 07 06:28:03 2019 +0000

description:
Sync with reality.

diffstat:

 sys/arch/amd64/conf/GENERIC |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r f1fd102645ec -r ca14a9d86b7c sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Wed Aug 07 06:23:48 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Wed Aug 07 06:28:03 2019 +0000
@@ -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 @@
 
 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        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