diff options
| author | joerg <joerg@NetBSD.org> | 2014-01-31 22:46:40 +0000 |
|---|---|---|
| committer | joerg <joerg@NetBSD.org> | 2014-01-31 22:46:40 +0000 |
| commit | ff39ff5402e39b306355fd795602005e66ffa921 (patch) | |
| tree | 3120e65afa1c4b43165f925d980363545421ab17 /libexec | |
| parent | bb1a41dcbd2c1738829af1bffd6fe66d590f5045 (diff) | |
Catch up with _lwp_park change.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/rtld.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libexec/ld.elf_so/rtld.c b/libexec/ld.elf_so/rtld.c index b6c0802987d..5e5d6452a02 100644 --- a/libexec/ld.elf_so/rtld.c +++ b/libexec/ld.elf_so/rtld.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.171 2013/11/20 07:18:23 skrll Exp $ */ +/* $NetBSD: rtld.c,v 1.172 2014/01/31 22:46:40 joerg Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: rtld.c,v 1.171 2013/11/20 07:18:23 skrll Exp $"); +__RCSID("$NetBSD: rtld.c,v 1.172 2014/01/31 22:46:40 joerg Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -1546,7 +1546,8 @@ _rtld_shared_enter(void) */ if ((_rtld_mutex & RTLD_EXCLUSIVE_MASK) || _rtld_waiter_exclusive) - _lwp_park(NULL, 0, __UNVOLATILE(&_rtld_mutex), NULL); + _lwp_park(CLOCK_REALTIME, 0, NULL, 0, + __UNVOLATILE(&_rtld_mutex), NULL); /* Try to remove us from the waiter list. */ atomic_cas_uint(&_rtld_waiter_shared, self, 0); if (waiter) @@ -1602,7 +1603,8 @@ _rtld_exclusive_enter(sigset_t *mask) _rtld_die(); } if (cur) - _lwp_park(NULL, 0, __UNVOLATILE(&_rtld_mutex), NULL); + _lwp_park(CLOCK_REALTIME, 0, NULL, 0, + __UNVOLATILE(&_rtld_mutex), NULL); atomic_cas_uint(&_rtld_waiter_exclusive, self, 0); if (waiter) _lwp_unpark(waiter, __UNVOLATILE(&_rtld_mutex)); |
