From b0df1c137c1d7cc6c086e8c3de63b91a97e180c7 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 16 Nov 2010 10:33:41 +0000 Subject: Sync: merge r215319 through r215395 from ^/head, so ports can actually build! :) --- sys/kern/kern_umtx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/kern/kern_umtx.c') 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) { -- cgit v1.1