Permalink
Browse files

MFC: r249410 (partial)

Remove ctl(4) from GENERIC.

With ctl(4) being built as a module and automatically loaded by ctladm(8),
this makes CTL work out of the box.

Note that unlike the original r249410, this commit does not remove the
kern.cam.ctl.disable tunable for POLA reasons.

PR:		174671, 175694, 179112
Reviewed by:	ken (original version)
Sponsored by:	FreeBSD Foundation (original version)
Approved by:	re (hrs)
  • Loading branch information...
sparcplug committed Aug 1, 2013
1 parent 4108c86 commit 80abc4594d8c902e16e1b33ba250ab6c37329e3c
Showing with 4 additions and 6 deletions.
  1. +1 −1 sys/amd64/conf/GENERIC
  2. +1 −1 sys/i386/conf/GENERIC
  3. +0 −2 sys/i386/conf/PAE
  4. +1 −1 sys/ia64/conf/GENERIC
  5. +1 −1 sys/sparc64/conf/GENERIC
View
@@ -124,7 +124,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
+#device ctl # CAM Target Layer
# RAID controllers interfaced to the SCSI subsystem
device amr # AMI MegaRAID
View
@@ -131,7 +131,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
+#device ctl # CAM Target Layer
# RAID controllers interfaced to the SCSI subsystem
device amr # AMI MegaRAID
View
@@ -39,8 +39,6 @@ nodevice ncv
nodevice nsp
nodevice stg
-nodevice ctl
-
nodevice asr
nodevice dpt
nodevice mly
View
@@ -100,7 +100,7 @@ device da # Direct Access (ie disk)
device pass # Passthrough (direct ATA/SCSI access)
device sa # Sequential Access (ie tape)
device ses # Enclosure Services (SES and SAF-TE)
-device ctl # CAM Target Layer
+#device ctl # CAM Target Layer
# RAID controllers
device aac # Adaptec FSA RAID
View
@@ -107,7 +107,7 @@ device sa # Sequential Access (tape etc)
device cd # CD
device pass # Passthrough device (direct ATA/SCSI access)
device ses # SCSI Environmental Services (and SAF-TE)
-device ctl # CAM Target Layer
+#device ctl # CAM Target Layer
# RAID controllers
#device amr # AMI MegaRAID

0 comments on commit 80abc45

Please sign in to comment.