diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2013-04-12 16:25:03 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2013-04-12 16:25:03 +0000 |
| commit | 8ed98609141e56dd738ea333279beec9f961dca8 (patch) | |
| tree | 0d3f89904a66a862c8883241e7d39bebcff52fcc /sys/amd64/conf | |
| parent | d1a51785b3aef6ac9340623162c2fd18b2f82e4d (diff) | |
| download | src-8ed98609141e56dd738ea333279beec9f961dca8.tar.gz src-8ed98609141e56dd738ea333279beec9f961dca8.zip | |
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
Notes
Notes:
svn path=/head/; revision=249410
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 828e6ea0b7d8..1043b2b47378 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -137,10 +137,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 interfaced to the SCSI subsystem device amr # AMI MegaRAID |