diff options
| author | mav <mav@FreeBSD.org> | 2014-11-19 13:04:25 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-11-19 13:04:25 +0000 |
| commit | 3f5a0d0ab24e72151ca67518aabf58e6965764b9 (patch) | |
| tree | a98a7ccd7e7913337a657bbcfdd35c6f9a3522c0 | |
| parent | af58768fe93c86956af565c332afbcc9c3218f73 (diff) | |
| download | FreeBSD-src-3f5a0d0ab24e72151ca67518aabf58e6965764b9.zip FreeBSD-src-3f5a0d0ab24e72151ca67518aabf58e6965764b9.tar.gz | |
Fix build without INVARIANTS, broken by r274675.
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 3 | ||||
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index e953a75..29960d7 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -2136,9 +2136,8 @@ static void isp_refire_putback_atio(void *arg) { union ccb *ccb = arg; - ispsoftc_t *isp = XS_ISP(ccb); - ISP_ASSERT_LOCKED(isp); + ISP_ASSERT_LOCKED((ispsoftc_t *)XS_ISP(ccb)); isp_target_putback_atio(ccb); } diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 5e32a20..812385e 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -400,9 +400,9 @@ struct isposinfo { /* * Locking macros... */ -#define ISP_LOCK(isp) mtx_lock(&isp->isp_osinfo.lock) -#define ISP_UNLOCK(isp) mtx_unlock(&isp->isp_osinfo.lock) -#define ISP_ASSERT_LOCKED(isp) mtx_assert(&isp->isp_osinfo.lock, MA_OWNED) +#define ISP_LOCK(isp) mtx_lock(&(isp)->isp_osinfo.lock) +#define ISP_UNLOCK(isp) mtx_unlock(&(isp)->isp_osinfo.lock) +#define ISP_ASSERT_LOCKED(isp) mtx_assert(&(isp)->isp_osinfo.lock, MA_OWNED) /* * Required Macros/Defines |
