summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1998-02-16 00:29:05 +0000
committermsmith <msmith@FreeBSD.org>1998-02-16 00:29:05 +0000
commit71765f512139b34a441e6bf7f3da328628d087ef (patch)
tree88483592828305d67ed2401d87b4c34997242df7 /sys/amd64/conf
parentbfe224349b6e7673bc149ec06c50aadf048a3e91 (diff)
downloadFreeBSD-src-71765f512139b34a441e6bf7f3da328628d087ef.zip
FreeBSD-src-71765f512139b34a441e6bf7f3da328628d087ef.tar.gz
TEMPORARILY disable support for the 4MB kernel page, as it appears to be
causing installation images for -current to be unbootable. Submitted by: phk
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r--sys/amd64/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index c6a83cb..a3292b7 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.104 1998/01/21 18:34:44 jkh Exp $
+# $Id: GENERIC,v 1.105 1998/01/24 02:54:09 eivind Exp $
machine "i386"
cpu "I386_CPU"
@@ -39,6 +39,8 @@ options FAILSAFE #Be conservative
options USERCONFIG #boot -c editor
options VISUAL_USERCONFIG #visual boot -c editor
+options DISABLE_PSE #disable broken PSE support
+
config kernel root on wd0
controller isa0
OpenPOWER on IntegriCloud