diff options
| author | kib <kib@FreeBSD.org> | 2014-11-20 11:33:38 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-11-20 11:33:38 +0000 |
| commit | 84d8d047ba855b0e24f1009141363b9d5e1dcf29 (patch) | |
| tree | 9738a4247ce7eb98774ee47923764b2c2863f87f /sys/kern/kern_umtx.c | |
| parent | 0682b47671d3100f825450e22bff4db3d1ff134d (diff) | |
| download | FreeBSD-src-84d8d047ba855b0e24f1009141363b9d5e1dcf29.zip FreeBSD-src-84d8d047ba855b0e24f1009141363b9d5e1dcf29.tar.gz | |
MFC r274478:
Fix assertion, &uc->uc_busy is never zero, the intent is to test the
uc_busy value, and not its address.
Diffstat (limited to 'sys/kern/kern_umtx.c')
| -rw-r--r-- | sys/kern/kern_umtx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 9217690..f064197 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -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 umtx_pi *pi, 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) { |
