diff options
| author | dim <dim@FreeBSD.org> | 2010-11-16 10:33:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-11-16 10:33:41 +0000 |
| commit | b0df1c137c1d7cc6c086e8c3de63b91a97e180c7 (patch) | |
| tree | 56f0dadc92981a1efbf66b53a434baa21a8c2c82 /sys/kern/kern_umtx.c | |
| parent | b355314642d1e24edf4e05d08b793f8b9ea76458 (diff) | |
| download | FreeBSD-src-b0df1c137c1d7cc6c086e8c3de63b91a97e180c7.zip FreeBSD-src-b0df1c137c1d7cc6c086e8c3de63b91a97e180c7.tar.gz | |
Sync: merge r215319 through r215395 from ^/head, so ports can actually
build! :)
Diffstat (limited to 'sys/kern/kern_umtx.c')
| -rw-r--r-- | sys/kern/kern_umtx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index cf8c534..951fef6 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -1592,11 +1592,11 @@ umtxq_sleep_pi(struct umtx_q *uq, struct umtx_pi *pi, /* XXX Only look up thread in current process. */ td1 = tdfind(owner, curproc->p_pid); mtx_lock_spin(&umtx_lock); - if (td1 != NULL && pi->pi_owner == NULL) { - uq1 = td1->td_umtxq; - umtx_pi_setowner(pi, td1); + if (td1 != NULL) { + if (pi->pi_owner == NULL) + umtx_pi_setowner(pi, td1); + PROC_UNLOCK(td1->td_proc); } - PROC_UNLOCK(td1->td_proc); } TAILQ_FOREACH(uq1, &pi->pi_blocked, uq_lockq) { |
