Module Name: src Committed By: snj Date: Thu Aug 24 06:50:16 UTC 2017
Modified Files: src/sys/arch/i386/conf [netbsd-7-0]: GENERIC Log Message: Apply patch (requested by maxv in ticket #1463): i386 GENERIC: disable VM86 by default. To generate a diff of this commit: cvs rdiff -u -r1.1107.2.8 -r1.1107.2.8.2.1 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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.8 src/sys/arch/i386/conf/GENERIC:1.1107.2.8.2.1 --- src/sys/arch/i386/conf/GENERIC:1.1107.2.8 Fri Jun 5 16:52:39 2015 +++ src/sys/arch/i386/conf/GENERIC Thu Aug 24 06:50:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj Exp $ +# $NetBSD: GENERIC,v 1.1107.2.8.2.1 2017/08/24 06:50:16 snj Exp $ # # GENERIC machine description file # @@ -22,12 +22,12 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1107.2.8 $" +#ident "GENERIC-$Revision: 1.1107.2.8.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)