diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-12-12 10:59:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-12 10:59:17 -0500 |
| commit | acbacfc4f14e55db3e9f31733e6537456ccc5f3d (patch) | |
| tree | 588db9c3094b8524511784a0786ff86f2888119c /usr/src | |
| parent | 1e522014629a0351696260af4326b143ec628f8c (diff) | |
| download | illumos-joyent-acbacfc4f14e55db3e9f31733e6537456ccc5f3d.tar.gz | |
OS-8430 LX: FUTEX_WAIT_BITSET should support timeout being NULL
Actually-authored-by: Dominik Hassler <hadfl@omnios.org>
Reviewed by: Dan McDonald <danmcd@mnx.io>
Reviewed by: Travis Paul <travis.paul@mnx.io>
Approved by: Brian Bennett <brian.bennett@mnx.io>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/brand/lx/syscall/lx_futex.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/uts/common/brand/lx/syscall/lx_futex.c b/usr/src/uts/common/brand/lx/syscall/lx_futex.c index d2148f60e0..b6244223f9 100644 --- a/usr/src/uts/common/brand/lx/syscall/lx_futex.c +++ b/usr/src/uts/common/brand/lx/syscall/lx_futex.c @@ -25,6 +25,7 @@ /* * Copyright 2020 Joyent, Inc. + * Copyright 2022 OmniOS Community Edition (OmniOSce) Association. */ #include <sys/types.h> @@ -1384,7 +1385,8 @@ lx_futex(uintptr_t addr, int op, int val, uintptr_t lx_timeout, case FUTEX_WAIT_BITSET: rval = futex_wait(&memid, (void *)addr, val, tptr, val3, - (op & FUTEX_CLOCK_REALTIME) ? B_FALSE : B_TRUE); + (tptr == NULL || (op & FUTEX_CLOCK_REALTIME) != 0) ? + B_FALSE : B_TRUE); break; case FUTEX_WAKE: |