[src/trunk]: src/sys/arch actually do what the previous change said:

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

details:   https://anonhg.NetBSD.org/src/rev/91036cf7b868
branches:  trunk
changeset: 321841:91036cf7b868
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Apr 07 19:39:19 2018 +0000

description:
actually do what the previous change said:
don't turn on the new 'SPECTRE_V2_GCC_MITIGATION' option yet.

diffstat:

 sys/arch/amd64/conf/GENERIC |  6 +++---
 sys/arch/i386/conf/GENERIC  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 41959647aa85 -r 91036cf7b868 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Apr 07 19:38:05 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Apr 07 19:39:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.487 2018/04/07 19:38:06 mrg Exp $
+# $NetBSD: GENERIC,v 1.488 2018/04/07 19:39:19 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.487 $"
+#ident         "GENERIC-$Revision: 1.488 $"
 
 maxusers       64              # estimated number of users
 
@@ -76,7 +76,7 @@
 # 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
+#makeoptions   SPECTRE_V2_GCC_MITIGATION=1     # GCC Spectre variant 2
                                                # migitation
 
 # CPU features
diff -r 41959647aa85 -r 91036cf7b868 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Apr 07 19:38:05 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Apr 07 19:39:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1175 2018/04/07 19:38:06 mrg Exp $
+# $NetBSD: GENERIC,v 1.1176 2018/04/07 19:39:19 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,14 +22,14 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1175 $"
+#ident         "GENERIC-$Revision: 1.1176 $"
 
 maxusers       64              # estimated number of users
 
 # CPU-related options.
 options        USER_LDT        # user-settable LDT; used by WINE
 #options       PAE             # PAE mode (36 bits physical addressing)
-makeoptions    SPECTRE_V2_GCC_MITIGATION=1     # GCC Spectre variant 2
+#makeoptions   SPECTRE_V2_GCC_MITIGATION=1     # GCC Spectre variant 2
                                                # migitation
 
 # CPU features