[src/netbsd-7-1]: src Apply patch (requested by maxv in ticket #1463):

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

details:   https://anonhg.NetBSD.org/src/rev/2047bec17595
branches:  netbsd-7-1
changeset: 800791:2047bec17595
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Aug 24 06:51:17 2017 +0000

description:
Apply patch (requested by maxv in ticket #1463):
i386 GENERIC: disable VM86 by default.

diffstat:

 doc/CHANGES-7.1.1          |  7 ++++++-
 sys/arch/i386/conf/GENERIC |  6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 6fa78936987d -r 2047bec17595 doc/CHANGES-7.1.1
--- a/doc/CHANGES-7.1.1 Sun Aug 20 05:45:36 2017 +0000
+++ b/doc/CHANGES-7.1.1 Thu Aug 24 06:51:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.26 2017/08/20 05:45:36 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.27 2017/08/24 06:51:38 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -3626,3 +3626,8 @@
        Update Heimdal to 7.1, fixing CVE-2016-2400.
        [mrg, ticket #1493]
 
+sys/arch/i386/conf/GENERIC                     patch
+
+       i386 GENERIC: disable VM86 by default.
+       [maxv, ticket #1463]
+
diff -r 6fa78936987d -r 2047bec17595 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Aug 20 05:45:36 2017 +0000
+++ b/sys/arch/i386/conf/GENERIC        Thu Aug 24 06:51:17 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.9.2.1 2017/08/24 06:51:17 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,12 +22,12 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1107.2.9 $"
+#ident                 "GENERIC-$Revision: 1.1107.2.9.2.1 $"
 
 maxusers       64              # estimated number of users
 
 # CPU-related options.
-options        VM86            # virtual 8086 emulation
+#options       VM86            # virtual 8086 emulation
 options        USER_LDT        # user-settable LDT; used by WINE
 #options       PAE             # PAE mode (36 bits physical addressing)