summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authornp <np@FreeBSD.org>2015-04-08 01:07:51 +0000
committernp <np@FreeBSD.org>2015-04-08 01:07:51 +0000
commit103da45e0b1d2e2cb18020a7c38a765a8d603ea3 (patch)
tree5e57578445ce119bc3ed0085d573b93d093b2f30 /sys/dev
parent6515048301bb913e90c1690d9988430588130757 (diff)
downloadFreeBSD-src-103da45e0b1d2e2cb18020a7c38a765a8d603ea3.zip
FreeBSD-src-103da45e0b1d2e2cb18020a7c38a765a8d603ea3.tar.gz
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.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cxgbe/adapter.h1
-rw-r--r--sys/dev/cxgbe/t4_main.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 01a17aa9..0e72fb3 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -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), \
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 5c25564..ccadfe2 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -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)
{
OpenPOWER on IntegriCloud