[src/netbsd-8]: src/sys/kern Pull up following revision(s) (requ...

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

details:   https://anonhg.NetBSD.org/src/rev/dae0eff05edc
branches:  netbsd-8
changeset: 319048:dae0eff05edc
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 14 19:11:21 2018 +0000
description:
Pull up following revision(s) (requested by gson in ticket #805):

        sys/kern/kern_lwp.c: revision 1.192

PR/kern/53202: Kernel hangs running t_ptrace_wait:resume1 test, revert
previous.

diffstat:

 sys/kern/kern_lwp.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r bfa726e9a64c -r dae0eff05edc sys/kern/kern_lwp.c
--- a/sys/kern/kern_lwp.c       Sat May 12 10:44:25 2018 +0000
+++ b/sys/kern/kern_lwp.c       Mon May 14 19:11:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj Exp $   */
+/*     $NetBSD: kern_lwp.c,v 1.189.2.2 2018/05/14 19:11:21 martin Exp $        */
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.189.2.2 2018/05/14 19:11:21 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
@@ -645,9 +645,8 @@
                 */
                if (exiting) {
                        KASSERT(p->p_nlwps > 1);
-                       error = cv_wait_sig(&p->p_lwpcv, p->p_lock);
-                       if (error == 0)
-                               error = EAGAIN;
+                       cv_wait(&p->p_lwpcv, p->p_lock);
+                       error = EAGAIN;
                        break;
                }