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

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sun Dec 10 09:35:04 UTC 2017

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

Log Message:
Pull up following revision(s) (requested by christos in ticket #417):
        sys/kern/kern_lwp.c: revision 1.191
Also wait interruptibly when exiting. Avoids deadlocked on exit processes
create by golang.


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.189.2.1 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 src/sys/kern/kern_lwp.c:1.189.2.1
--- src/sys/kern/kern_lwp.c:1.189	Thu Jun  1 02:45:13 2017
+++ src/sys/kern/kern_lwp.c	Sun Dec 10 09:35:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lwp.c,v 1.189 2017/06/01 02:45:13 chs Exp $	*/
+/*	$NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj 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 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.189.2.1 2017/12/10 09:35:03 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
@@ -645,8 +645,9 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
 		 */
 		if (exiting) {
 			KASSERT(p->p_nlwps > 1);
-			cv_wait(&p->p_lwpcv, p->p_lock);
-			error = EAGAIN;
+			error = cv_wait_sig(&p->p_lwpcv, p->p_lock);
+			if (error == 0)
+				error = EAGAIN;
 			break;
 		}