Author: marius Date: Thu Aug 1 13:18:47 2013 New Revision: 253860 URL: http://svnweb.freebsd.org/changeset/base/253860
Log: 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) Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC stable/9/sys/i386/conf/PAE stable/9/sys/ia64/conf/GENERIC stable/9/sys/sparc64/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/amd64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -124,7 +124,7 @@ device sa # Sequential Access (tape et 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 Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/i386/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -131,7 +131,7 @@ device sa # Sequential Access (tape et 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 Modified: stable/9/sys/i386/conf/PAE ============================================================================== --- stable/9/sys/i386/conf/PAE Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/i386/conf/PAE Thu Aug 1 13:18:47 2013 (r253860) @@ -39,8 +39,6 @@ nodevice ncv nodevice nsp nodevice stg -nodevice ctl - nodevice asr nodevice dpt nodevice mly Modified: stable/9/sys/ia64/conf/GENERIC ============================================================================== --- stable/9/sys/ia64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/ia64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -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 Modified: stable/9/sys/sparc64/conf/GENERIC ============================================================================== --- stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 12:55:41 2013 (r253859) +++ stable/9/sys/sparc64/conf/GENERIC Thu Aug 1 13:18:47 2013 (r253860) @@ -107,7 +107,7 @@ device sa # Sequential Access (tape et 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 _______________________________________________ svn-src-stable-9@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
