Module Name: src
Committed By: mrg
Date: Sat Apr 7 19:39:19 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
actually do what the previous change said:
don't turn on the new 'SPECTRE_V2_GCC_MITIGATION' option yet.
To generate a diff of this commit:
cvs rdiff -u -r1.487 -r1.488 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1175 -r1.1176 src/sys/arch/i386/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.487 src/sys/arch/amd64/conf/GENERIC:1.488
--- src/sys/arch/amd64/conf/GENERIC:1.487 Sat Apr 7 19:38:06 2018
+++ src/sys/arch/amd64/conf/GENERIC Sat Apr 7 19:39:19 2018
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ options SYSCTL_INCLUDE_DESCR # Include
# 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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1175 src/sys/arch/i386/conf/GENERIC:1.1176
--- src/sys/arch/i386/conf/GENERIC:1.1175 Sat Apr 7 19:38:06 2018
+++ src/sys/arch/i386/conf/GENERIC Sat Apr 7 19:39:19 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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
