diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
| commit | ca65be80fd770188b15b4aecdd245ddbeb7f46ed (patch) | |
| tree | b76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/cam/cam_xpt.c | |
| parent | 4104449570e3e74d77537f3a798fbdd632ad311c (diff) | |
| parent | fb64e73880228db0132e7001564d85d5e33a40ea (diff) | |
| download | src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.tar.gz src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.zip | |
Merge ^/head r279313 through r279595.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279596
Diffstat (limited to 'sys/cam/cam_xpt.c')
| -rw-r--r-- | sys/cam/cam_xpt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 75d81e6f41b1..c8a9c371af57 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -151,6 +151,8 @@ typedef int xpt_pdrvfunc_t (struct periph_driver **pdrv, void *arg); /* Transport layer configuration information */ static struct xpt_softc xsoftc; +MTX_SYSINIT(xpt_topo_init, &xsoftc.xpt_topo_lock, "XPT topology lock", MTX_DEF); + SYSCTL_INT(_kern_cam, OID_AUTO, boot_delay, CTLFLAG_RDTUN, &xsoftc.boot_delay, 0, "Bus registration wait time"); SYSCTL_UINT(_kern_cam, OID_AUTO, xpt_generation, CTLFLAG_RD, @@ -850,7 +852,6 @@ xpt_init(void *dummy) mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF); mtx_init(&xsoftc.xpt_highpower_lock, "XPT highpower lock", NULL, MTX_DEF); - mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF); xsoftc.xpt_taskq = taskqueue_create("CAM XPT task", M_WAITOK, taskqueue_thread_enqueue, /*context*/&xsoftc.xpt_taskq); |