summaryrefslogtreecommitdiffstats
path: root/sys/conf/options
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>2013-03-04 21:18:45 +0000
committerken <ken@FreeBSD.org>2013-03-04 21:18:45 +0000
commitd11db422c662c0440d224e37ed2a4ada644281ea (patch)
treec467e991d146b31969bf93654bd35ec47890a378 /sys/conf/options
parent322c45390e3623d70a73fc8e0c5086a129d35aa1 (diff)
downloadFreeBSD-src-d11db422c662c0440d224e37ed2a4ada644281ea.zip
FreeBSD-src-d11db422c662c0440d224e37ed2a4ada644281ea.tar.gz
Re-enable CTL in GENERIC on i386 and amd64, but turn on the CTL disable
tunable by default. This will allow GENERIC configurations to boot on small memory boxes, but not require end users who want to use CTL to recompile their kernel. They can simply set kern.cam.ctl.disable=0 in loader.conf. The eventual solution to the memory usage problem is to change the way CTL allocates memory to be more configurable, but this should fix things for small memory situations in the mean time. UPDATING: Explain the change in the CTL configuration, and how users can enable CTL if they would like to use it. sys/conf/options: Add a new option, CTL_DISABLE, that prevents CTL from initializing. ctl.c: If CTL_DISABLE is turned on, don't initialize. i386/conf/GENERIC, amd64/conf/GENERIC: Re-enable device ctl, and add the CTL_DISABLE option.
Diffstat (limited to 'sys/conf/options')
-rw-r--r--sys/conf/options3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 75d0c97..ec9271d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -329,6 +329,9 @@ SCSI_PT_DEFAULT_TIMEOUT opt_pt.h
# Options used only in cam/scsi/scsi_ses.c
SES_ENABLE_PASSTHROUGH opt_ses.h
+# Options used only in cam/ctl
+CTL_DISABLE opt_ctl.h
+
# Options used in dev/sym/ (Symbios SCSI driver).
SYM_SETUP_LP_PROBE_MAP opt_sym.h #-Low Priority Probe Map (bits)
# Allows the ncr to take precedence
OpenPOWER on IntegriCloud