From 9a2480f15b154f3c5ca99e825b63c37f198078e1 Mon Sep 17 00:00:00 2001 From: Sean Bruno Date: Fri, 16 Nov 2018 17:33:37 -0700 Subject: [PATCH] Merge pull request #69 from kevans91/deadlock-dbg Fix DETECT_DEADLOCK build after 1a965785f335 --- bsd-user/freebsd/os-thread.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bsd-user/freebsd/os-thread.c b/bsd-user/freebsd/os-thread.c index 91725bbb42b..e2980731813 100644 --- a/bsd-user/freebsd/os-thread.c +++ b/bsd-user/freebsd/os-thread.c @@ -278,7 +278,7 @@ static abi_long _umtx_wait(abi_ulong *addr, abi_ulong target_val, size_t tsz, /* target_val has already been tswap'ed. */ - if (ut == NULL) { + if (t == NULL) { struct timespec ts; ts.tv_sec = 5; @@ -482,7 +482,7 @@ abi_long freebsd_umtx_sem2_wait(abi_ulong obj, size_t tsz, void *t) (int)tsz, t); #if DETECT_DEADLOCK - if (ut != NULL) { + if (t != NULL) { ret = _umtx_wait_uint_private(addr, tswap32(USEM_HAS_WAITERS), tsz, t, __func__); } else { @@ -522,7 +522,7 @@ abi_long freebsd_umtx_sem2_wait(abi_ulong obj, size_t tsz, void *t) DEBUG_UMTX(" %s: _umtx_op(%p, %d, %p)\n", __func__, addr, UMTX_OP_WAIT_UINT, (int)tsz, t); #if DETECT_DEADLOCK - if (ut != NULL) { + if (t != NULL) { ret = _umtx_wait_uint(addr, tswap32(USEM_HAS_WAITERS), tsz, t, __func__); } else {