diff options
| author | melifaro <melifaro@FreeBSD.org> | 2014-08-23 14:58:31 +0000 |
|---|---|---|
| committer | melifaro <melifaro@FreeBSD.org> | 2014-08-23 14:58:31 +0000 |
| commit | cf94663e69b2c927e4a44dcb922c93483f11bc29 (patch) | |
| tree | f43a461c97f3db054606f6367939a61652f0db97 /sys/kern/kern_umtx.c | |
| parent | 2e65f120c886a9d09b274b1953783df2b995e799 (diff) | |
| parent | 19be009a4f8eb0d239ec3e465b0a9b2a2947dcf8 (diff) | |
| download | FreeBSD-src-cf94663e69b2c927e4a44dcb922c93483f11bc29.zip FreeBSD-src-cf94663e69b2c927e4a44dcb922c93483f11bc29.tar.gz | |
Sync to HEAD@r270409.
Diffstat (limited to 'sys/kern/kern_umtx.c')
| -rw-r--r-- | sys/kern/kern_umtx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 67720f8..7cfef38 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -1700,10 +1700,12 @@ do_lock_pi(struct thread *td, struct umutex *m, uint32_t flags, * and we need to retry or we lost a race to the thread * unlocking the umtx. */ - if (old == owner) + if (old == owner) { error = umtxq_sleep_pi(uq, pi, owner & ~UMUTEX_CONTESTED, "umtxpi", timeout == NULL ? NULL : &timo); - else { + if (error != 0) + continue; + } else { umtxq_unbusy(&uq->uq_key); umtxq_unlock(&uq->uq_key); } |
