summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/conf/NOTES11
-rw-r--r--sys/conf/files.i3864
-rw-r--r--sys/conf/options.i3863
-rw-r--r--sys/i386/conf/LINT11
-rw-r--r--sys/i386/conf/NOTES11
-rw-r--r--sys/i386/conf/files.i3864
-rw-r--r--sys/i386/conf/options.i3863
7 files changed, 12 insertions, 35 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f94f3f5..f4df5f5 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.603 1999/05/23 11:11:31 peter Exp $
+# $Id: LINT,v 1.604 1999/05/28 10:27:22 roger Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -259,13 +259,6 @@ options SYSVMSG
#
options MD5
-#
-# Allow processes to switch to vm86 mode, as well as enabling direct
-# user-mode access to the I/O port space. This option is necessary for
-# the doscmd emulator to run and the VESA modes in syscons to be available.
-#
-options VM86
-
#####################################################################
# DEBUGGING OPTIONS
@@ -924,7 +917,7 @@ options VGA_NO_MODE_CHANGE # don't change video modes
options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
# To include support for VESA video modes
-options VESA # needs VM86 defined too!!
+options VESA
# Splash screen at start up! Screen savers require this too.
pseudo-device splash
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index fea45b9..dede746 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.244 1999/06/01 09:02:27 dfr Exp $
+# $Id: files.i386,v 1.245 1999/06/01 11:16:23 dfr Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -102,7 +102,7 @@ i386/i386/sys_machdep.c standard
i386/i386/trap.c standard
i386/i386/userconfig.c optional userconfig
i386/i386/vm_machdep.c standard
-i386/i386/vm86.c optional vm86
+i386/i386/vm86.c standard
i386/ibcs2/ibcs2_fcntl.c optional ibcs2
i386/ibcs2/ibcs2_stat.c optional ibcs2
i386/ibcs2/ibcs2_ipc.c optional ibcs2
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 205912e..9064fd9 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.113 1999/05/09 13:10:49 peter Exp $
+# $Id: options.i386,v 1.114 1999/05/20 10:08:40 hm Exp $
DISABLE_PSE
IDE_DELAY
@@ -6,7 +6,6 @@ USER_LDT
MATH_EMULATE opt_math_emulate.h
GPL_MATH_EMULATE opt_math_emulate.h
PMAP_SHPGPERPROC opt_pmap.h
-VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f94f3f5..f4df5f5 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.603 1999/05/23 11:11:31 peter Exp $
+# $Id: LINT,v 1.604 1999/05/28 10:27:22 roger Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -259,13 +259,6 @@ options SYSVMSG
#
options MD5
-#
-# Allow processes to switch to vm86 mode, as well as enabling direct
-# user-mode access to the I/O port space. This option is necessary for
-# the doscmd emulator to run and the VESA modes in syscons to be available.
-#
-options VM86
-
#####################################################################
# DEBUGGING OPTIONS
@@ -924,7 +917,7 @@ options VGA_NO_MODE_CHANGE # don't change video modes
options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
# To include support for VESA video modes
-options VESA # needs VM86 defined too!!
+options VESA
# Splash screen at start up! Screen savers require this too.
pseudo-device splash
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f94f3f5..f4df5f5 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.603 1999/05/23 11:11:31 peter Exp $
+# $Id: LINT,v 1.604 1999/05/28 10:27:22 roger Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -259,13 +259,6 @@ options SYSVMSG
#
options MD5
-#
-# Allow processes to switch to vm86 mode, as well as enabling direct
-# user-mode access to the I/O port space. This option is necessary for
-# the doscmd emulator to run and the VESA modes in syscons to be available.
-#
-options VM86
-
#####################################################################
# DEBUGGING OPTIONS
@@ -924,7 +917,7 @@ options VGA_NO_MODE_CHANGE # don't change video modes
options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
# To include support for VESA video modes
-options VESA # needs VM86 defined too!!
+options VESA
# Splash screen at start up! Screen savers require this too.
pseudo-device splash
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index fea45b9..dede746 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.244 1999/06/01 09:02:27 dfr Exp $
+# $Id: files.i386,v 1.245 1999/06/01 11:16:23 dfr Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -102,7 +102,7 @@ i386/i386/sys_machdep.c standard
i386/i386/trap.c standard
i386/i386/userconfig.c optional userconfig
i386/i386/vm_machdep.c standard
-i386/i386/vm86.c optional vm86
+i386/i386/vm86.c standard
i386/ibcs2/ibcs2_fcntl.c optional ibcs2
i386/ibcs2/ibcs2_stat.c optional ibcs2
i386/ibcs2/ibcs2_ipc.c optional ibcs2
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 205912e..9064fd9 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-# $Id: options.i386,v 1.113 1999/05/09 13:10:49 peter Exp $
+# $Id: options.i386,v 1.114 1999/05/20 10:08:40 hm Exp $
DISABLE_PSE
IDE_DELAY
@@ -6,7 +6,6 @@ USER_LDT
MATH_EMULATE opt_math_emulate.h
GPL_MATH_EMULATE opt_math_emulate.h
PMAP_SHPGPERPROC opt_pmap.h
-VM86 opt_vm86.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
OpenPOWER on IntegriCloud