Module Name: src
Committed By: martin
Date: Sun Jan 25 10:22:59 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-6]: rtld.c
Log Message:
Pull up the following, requested by he in ticket #1238:
src/libexec/ld.elf_so/rtld.c 1.161
Fix the other lwp_park() to pass 0 for the 'unpark' lwp.
To generate a diff of this commit:
cvs rdiff -u -r1.155.2.2 -r1.155.2.3 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.2 src/libexec/ld.elf_so/rtld.c:1.155.2.3
--- src/libexec/ld.elf_so/rtld.c:1.155.2.2 Sat Jan 24 13:49:23 2015
+++ src/libexec/ld.elf_so/rtld.c Sun Jan 25 10:22:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155.2.2 2015/01/24 13:49:23 martin Exp $ */
+/* $NetBSD: rtld.c,v 1.155.2.3 2015/01/25 10:22:59 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.2 2015/01/24 13:49:23 martin Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.3 2015/01/25 10:22:59 martin Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1561,7 +1561,7 @@ _rtld_exclusive_enter(sigset_t *mask)
_rtld_die();
}
if (cur)
- _lwp_park(NULL, -1, __UNVOLATILE(&_rtld_mutex), NULL);
+ _lwp_park(NULL, 0, __UNVOLATILE(&_rtld_mutex), NULL);
atomic_cas_uint(&_rtld_waiter_exclusive, self, 0);
if (waiter)
_lwp_unpark(waiter, __UNVOLATILE(&_rtld_mutex));
