Module Name: src
Committed By: christos
Date: Mon Apr 23 15:51:00 UTC 2018
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
PR/kern/53202: Kernel hangs running t_ptrace_wait:resume1 test, revert
previous.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 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.191 src/sys/kern/kern_lwp.c:1.192
--- src/sys/kern/kern_lwp.c:1.191 Sat Dec 2 17:51:22 2017
+++ src/sys/kern/kern_lwp.c Mon Apr 23 11:51:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.191 2017/12/02 22:51:22 christos Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.192 2018/04/23 15:51:00 christos 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.191 2017/12/02 22:51:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.192 2018/04/23 15:51:00 christos 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;
}
