CVS commit: [netbsd-8] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Mon May 14 19:11:21 UTC 2018

Modified Files:
        src/sys/kern [netbsd-8]: kern_lwp.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.189.2.1 -r1.189.2.2 src/sys/kern/kern_lwp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.189.2.1 src/sys/kern/kern_lwp.c:1.189.2.2
--- src/sys/kern/kern_lwp.c:1.189.2.1	Sun Dec 10 09:35:03 2017
+++ src/sys/kern/kern_lwp.c	Mon May 14 19:11:21 2018
@@ -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 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
 		 */
 		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;
 		}