Author: mav
Date: Wed Nov 19 13:04:25 2014
New Revision: 274708
URL: https://svnweb.freebsd.org/changeset/base/274708
Log:
Fix build without INVARIANTS, broken by r274675.
Modified:
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/isp_freebsd.h
Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c Wed Nov 19 11:05:45 2014
(r274707)
+++ head/sys/dev/isp/isp_freebsd.c Wed Nov 19 13:04:25 2014
(r274708)
@@ -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);
}
Modified: head/sys/dev/isp/isp_freebsd.h
==============================================================================
--- head/sys/dev/isp/isp_freebsd.h Wed Nov 19 11:05:45 2014
(r274707)
+++ head/sys/dev/isp/isp_freebsd.h Wed Nov 19 13:04:25 2014
(r274708)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
