From bdfa5c0012c7c9eade7aed210b11819158314da3 Mon Sep 17 00:00:00 2001 From: ad Date: Sun, 19 Apr 2020 23:05:04 +0000 Subject: [PATCH] lwp_wait(): don't need to check for process exit, cv_wait_sig() does it. --- sys/kern/kern_lwp.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_lwp.c b/sys/kern/kern_lwp.c index 7a6e5c0ee9cd..7b99584c36a6 100644 --- a/sys/kern/kern_lwp.c +++ b/sys/kern/kern_lwp.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.233 2020/04/04 20:20:12 thorpej Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.234 2020/04/19 23:05:04 ad Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020 @@ -211,7 +211,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.233 2020/04/04 20:20:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.234 2020/04/19 23:05:04 ad Exp $"); #include "opt_ddb.h" #include "opt_lockdebug.h" @@ -740,13 +740,11 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwpid_t *departed, bool exiting) } /* - * Break out if the process is exiting, or if all LWPs are - * in _lwp_wait(). There are other ways to hang the process - * with _lwp_wait(), but the sleep is interruptable so - * little point checking for them. + * Break out if all LWPs are in _lwp_wait(). There are + * other ways to hang the process with _lwp_wait(), but the + * sleep is interruptable so little point checking for them. */ - if ((p->p_sflag & PS_WEXIT) != 0 || - p->p_nlwpwait == p->p_nlwps) { + if (p->p_nlwpwait == p->p_nlwps) { error = EDEADLK; break; }