svn commit: r281249 - stable/10/sys/dev/cxgbe
Navdeep Parhar
np at FreeBSD.org
Wed Apr 8 01:07:52 UTC 2015
Author: np
Date: Wed Apr 8 01:07:51 2015
New Revision: 281249
URL: https://svnweb.freebsd.org/changeset/base/281249
Log:
MFC r278371:
cxgbe(4): a change to the synchronization rules within the the driver.
This is purely cosmetic because the new rules are already followed.
Modified:
stable/10/sys/dev/cxgbe/adapter.h
stable/10/sys/dev/cxgbe/t4_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/10/sys/dev/cxgbe/adapter.h Wed Apr 8 01:05:50 2015 (r281248)
+++ stable/10/sys/dev/cxgbe/adapter.h Wed Apr 8 01:07:51 2015 (r281249)
@@ -803,7 +803,6 @@ struct adapter {
#define ADAPTER_LOCK_ASSERT_OWNED(sc) mtx_assert(&(sc)->sc_lock, MA_OWNED)
#define ADAPTER_LOCK_ASSERT_NOTOWNED(sc) mtx_assert(&(sc)->sc_lock, MA_NOTOWNED)
-/* XXX: not bulletproof, but much better than nothing */
#define ASSERT_SYNCHRONIZED_OP(sc) \
KASSERT(IS_BUSY(sc) && \
(mtx_owned(&(sc)->sc_lock) || sc->last_op_thr == curthread), \
Modified: stable/10/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/10/sys/dev/cxgbe/t4_main.c Wed Apr 8 01:05:50 2015 (r281248)
+++ stable/10/sys/dev/cxgbe/t4_main.c Wed Apr 8 01:07:51 2015 (r281249)
@@ -3049,6 +3049,9 @@ mcfail:
return (rc);
}
+/*
+ * {begin|end}_synchronized_op must be called from the same thread.
+ */
int
begin_synchronized_op(struct adapter *sc, struct port_info *pi, int flags,
char *wmesg)
@@ -3104,6 +3107,9 @@ done:
return (rc);
}
+/*
+ * {begin|end}_synchronized_op must be called from the same thread.
+ */
void
end_synchronized_op(struct adapter *sc, int flags)
{
More information about the svn-src-stable-10
mailing list