Author: kib
Date: Thu Nov 20 11:33:38 2014
New Revision: 274748
URL: https://svnweb.freebsd.org/changeset/base/274748
Log:
MFC r274478:
Fix assertion, &uc->uc_busy is never zero, the intent is to test the
uc_busy value, and not its address.
Modified:
stable/10/sys/kern/kern_umtx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/kern/kern_umtx.c
==============================================================================
--- stable/10/sys/kern/kern_umtx.c Thu Nov 20 11:29:43 2014
(r274747)
+++ stable/10/sys/kern/kern_umtx.c Thu Nov 20 11:33:38 2014
(r274748)
@@ -169,7 +169,6 @@ struct umtxq_chain {
};
#define UMTXQ_LOCKED_ASSERT(uc) mtx_assert(&(uc)->uc_lock,
MA_OWNED)
-#define UMTXQ_BUSY_ASSERT(uc) KASSERT(&(uc)->uc_busy, ("umtx chain is
not busy"))
/*
* Don't propagate time-sharing priority, there is a security reason,
@@ -1843,7 +1842,7 @@ umtxq_sleep_pi(struct umtx_q *uq, struct
KASSERT(td == curthread, ("inconsistent uq_thread"));
uc = umtxq_getchain(&uq->uq_key);
UMTXQ_LOCKED_ASSERT(uc);
- UMTXQ_BUSY_ASSERT(uc);
+ KASSERT(uc->uc_busy != 0, ("umtx chain is not busy"));
umtxq_insert(uq);
mtx_lock_spin(&umtx_lock);
if (pi->pi_owner == NULL) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
