Author: sbruno
Date: Wed May  8 15:45:52 2013
New Revision: 250366
URL: http://svnweb.freebsd.org/changeset/base/250366

Log:
  MFC r249664
  
  Expose CAM_BOOT_DELAY as a kernel conf item now.
  
  This allows users who boot without loader to adjust their environments
  around slightly buggy or slow hardware.

Modified:
  stable/9/sys/cam/cam_xpt.c
  stable/9/sys/conf/options
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/cam/cam_xpt.c
==============================================================================
--- stable/9/sys/cam/cam_xpt.c  Wed May  8 14:13:14 2013        (r250365)
+++ stable/9/sys/cam/cam_xpt.c  Wed May  8 15:45:52 2013        (r250366)
@@ -908,6 +908,13 @@ xpt_init(void *dummy)
        mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF);
        mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF);
 
+#ifdef CAM_BOOT_DELAY
+       /*
+        * Override this value at compile time to assist our users
+        * who don't use loader to boot a kernel.
+        */
+       xsoftc.boot_delay = CAM_BOOT_DELAY;
+#endif
        /*
         * The xpt layer is, itself, the equivelent of a SIM.
         * Allow 16 ccbs in the ccb pool for it.  This should

Modified: stable/9/sys/conf/options
==============================================================================
--- stable/9/sys/conf/options   Wed May  8 14:13:14 2013        (r250365)
+++ stable/9/sys/conf/options   Wed May  8 15:45:52 2013        (r250366)
@@ -308,6 +308,7 @@ CAM_DEBUG_BUS               opt_cam.h
 CAM_DEBUG_TARGET       opt_cam.h
 CAM_DEBUG_LUN          opt_cam.h
 CAM_DEBUG_FLAGS                opt_cam.h
+CAM_BOOT_DELAY         opt_cam.h
 SCSI_DELAY             opt_scsi.h
 SCSI_NO_SENSE_STRINGS  opt_scsi.h
 SCSI_NO_OP_STRINGS     opt_scsi.h
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to