summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2004-03-13 22:16:34 +0000
committerpeter <peter@FreeBSD.org>2004-03-13 22:16:34 +0000
commit8024902d9aa99f3b2c6d9f3f68f774174ddbfca0 (patch)
tree535d2418f52fbbce8ae14e4f298794d2530f27a0
parent8ed79310d309a0413a7d64ef1cc6f0cf5c0c04af (diff)
downloadFreeBSD-src-8024902d9aa99f3b2c6d9f3f68f774174ddbfca0.zip
FreeBSD-src-8024902d9aa99f3b2c6d9f3f68f774174ddbfca0.tar.gz
MFp4: comment out options that don't exist so that they cannot be
accidently added to config files and be silently accepted. Comment out one bogo-option that crept into NOTES.
-rw-r--r--sys/amd64/conf/NOTES2
-rw-r--r--sys/conf/options.amd6413
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index fb061a7..bc95c71 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -477,7 +477,7 @@ options PMAP_SHPGPERPROC=201
# (whether static or dynamic).
#
#XXX#options COMPAT_SVR4 # build emulator statically
-options DEBUG_SVR4 # enable verbose debugging
+#XXX#options DEBUG_SVR4 # enable verbose debugging
#XXX#device streams # STREAMS network driver (required for svr4).
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 0c1016a..097b622 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -10,14 +10,11 @@ PMAP_SHPGPERPROC opt_pmap.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
# (see src/sys/conf/options), except for broken debugging options.
-IBCS2 opt_dontuse.h
-COMPAT_LINUX opt_dontuse.h
-COMPAT_SVR4 opt_dontuse.h
-DEBUG_SVR4 opt_svr4.h
-NDISAPI opt_dontuse.h
-
-# Change KVM size. Changes things all over the kernel.
-KVA_PAGES opt_global.h
+#IBCS2 opt_dontuse.h
+#COMPAT_LINUX opt_dontuse.h
+#COMPAT_SVR4 opt_dontuse.h
+#DEBUG_SVR4 opt_svr4.h
+#NDISAPI opt_dontuse.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
OpenPOWER on IntegriCloud