summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2013-04-12 16:25:03 +0000
committertrasz <trasz@FreeBSD.org>2013-04-12 16:25:03 +0000
commit80b8b2f7791585982400714f802d5617862e9c68 (patch)
tree0d3f89904a66a862c8883241e7d39bebcff52fcc /sys/sparc64
parent06443169d2a0b4fd8cfe68856c1285347f5e59b0 (diff)
downloadFreeBSD-src-80b8b2f7791585982400714f802d5617862e9c68.zip
FreeBSD-src-80b8b2f7791585982400714f802d5617862e9c68.tar.gz
Remove ctl(4) from GENERIC. Also remove 'options CTL_DISABLE'
and kern.cam.ctl.disable tunable; those were introduced as a workaround to make it possible to boot GENERIC on low memory machines. With ctl(4) being built as a module and automatically loaded by ctladm(8), this makes CTL work out of the box. Reviewed by: ken Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/conf/GENERIC5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 818394e..ad8f429 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -120,10 +120,7 @@ device sa # Sequential Access (tape etc)
device cd # CD
device pass # Passthrough device (direct ATA/SCSI access)
device ses # Enclosure Services (SES and SAF-TE)
-device ctl # CAM Target Layer
-options CTL_DISABLE # Disable CTL by default to save memory.
- # Re-enable with kern.cam.ctl.disable=0 in
- # /boot/loader.conf
+#device ctl # CAM Target Layer
# RAID controllers
#device amr # AMI MegaRAID
OpenPOWER on IntegriCloud