Module Name: src
Committed By: martin
Date: Sat Jan 24 13:49:23 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-6]: rtld.c
Log Message:
Pull up following revision(s) (requested by he in ticket #1238):
libexec/ld.elf_so/rtld.c: revision 1.160
You need to pass 0 (not -1) to lwp_park() if you don't also
want to do an unpark.
Clearly this code path was never tested!
To generate a diff of this commit:
cvs rdiff -u -r1.155.2.1 -r1.155.2.2 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.155.2.1 src/libexec/ld.elf_so/rtld.c:1.155.2.2
--- src/libexec/ld.elf_so/rtld.c:1.155.2.1 Wed Oct 17 22:36:59 2012
+++ src/libexec/ld.elf_so/rtld.c Sat Jan 24 13:49:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $ */
+/* $NetBSD: rtld.c,v 1.155.2.2 2015/01/24 13:49:23 martin Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.2 2015/01/24 13:49:23 martin Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1505,7 +1505,7 @@ _rtld_shared_enter(void)
*/
if ((_rtld_mutex & RTLD_EXCLUSIVE_MASK) ||
_rtld_waiter_exclusive)
- _lwp_park(NULL, -1, __UNVOLATILE(&_rtld_mutex), NULL);
+ _lwp_park(NULL, 0, __UNVOLATILE(&_rtld_mutex), NULL);
/* Try to remove us from the waiter list. */
atomic_cas_uint(&_rtld_waiter_shared, self, 0);
if (waiter)
