[src/netbsd-6]: src/libexec/ld.elf_so Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a017dad2fa6c
branches:  netbsd-6
changeset: 776879:a017dad2fa6c
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 24 13:49:23 2015 +0000

description:
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!

diffstat:

 libexec/ld.elf_so/rtld.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 23a109e0fccb -r a017dad2fa6c libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Sat Jan 24 13:45:46 2015 +0000
+++ b/libexec/ld.elf_so/rtld.c  Sat Jan 24 13:49:23 2015 +0000
@@ -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 @@
                 */
                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)