summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-19 09:45:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-19 09:45:02 +0000
commit35f01a75278c1867e62d90e7448de7663cb2ffec (patch)
tree5fe51b032b345e084a9f06fa2a0e3f02d2190d7e /sys/arch/i386/conf
parentcc0383396c3ae0d1a1ee340e1068c17d78e1f7cc (diff)
disable VM86/USER_LDT by default, until checked again for h0l3z
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index cced82f7798..65b65f66a67 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.45 1997/09/13 21:43:44 mickey Exp $
+# $OpenBSD: GENERIC,v 1.46 1997/09/19 09:45:01 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -13,8 +13,8 @@ option I486_CPU
option I586_CPU
option GPL_MATH_EMULATE # floating point emulation
-option VM86 # Virtual 8086 emulation
-option USER_LDT # user-settable LDT; used by WINE
+#option VM86 # Virtual 8086 emulation
+#option USER_LDT # user-settable LDT; used by WINE
option XSERVER
# Some BIOSes don't get the size of extended memory right. If you