Sat Aug 26 16:26:46 2017 UTC ()
Apply patch (requested by maxv in ticket #1466):
Disable vm86 by default. The use case is limited, and the potential
for damage is too high.


(snj)
diff -r1.1066.2.7 -r1.1066.2.8 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.1066.2.7 -r1.1066.2.8 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2012/08/15 15:33:00 1.1066.2.7
+++ src/sys/arch/i386/conf/GENERIC 2017/08/26 16:26:46 1.1066.2.8
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: GENERIC,v 1.1066.2.7 2012/08/15 15:33:00 sborrill Exp $ 1# $NetBSD: GENERIC,v 1.1066.2.8 2017/08/26 16:26:46 snj Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1066.2.7 $" 25#ident "GENERIC-$Revision: 1.1066.2.8 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options VM86 # virtual 8086 emulation 30#options VM86 # virtual 8086 emulation
31options USER_LDT # user-settable LDT; used by WINE 31options USER_LDT # user-settable LDT; used by WINE
32#options PAE # PAE mode (36 bits physical addressing) 32#options PAE # PAE mode (36 bits physical addressing)
33 33
34# CPU features 34# CPU features
35acpicpu* at cpu? # ACPI CPU (including frequency scaling) 35acpicpu* at cpu? # ACPI CPU (including frequency scaling)
36coretemp* at cpu? # Intel on-die thermal sensor 36coretemp* at cpu? # Intel on-die thermal sensor
37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 37est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
38#odcm0 at cpu0 # On-demand clock modulation 38#odcm0 at cpu0 # On-demand clock modulation
39#padlock0 at cpu0 # VIA PadLock 39#padlock0 at cpu0 # VIA PadLock
40powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) 40powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
41viac7temp* at cpu? # VIA C7 temperature sensor 41viac7temp* at cpu? # VIA C7 temperature sensor
42 42
43options MTRR # memory-type range register syscall support 43options MTRR # memory-type range register syscall support