Module Name: src
Committed By: ahoka
Date: Tue Apr 26 17:40:38 UTC 2011
Modified Files:
src/sys/kern: kern_kthread.c
Log Message:
Hold the current lwp's mutex, instead of the lwp we want to wait for
in kthread_join(). This fixes panics with DIAGNOSTIC and possibly some
rare race conditons.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/kern_kthread.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_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.31 src/sys/kern/kern_kthread.c:1.32
--- src/sys/kern/kern_kthread.c:1.31 Thu Feb 17 19:27:13 2011
+++ src/sys/kern/kern_kthread.c Tue Apr 26 17:40:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kthread.c,v 1.31 2011/02/17 19:27:13 matt Exp $ */
+/* $NetBSD: kern_kthread.c,v 1.32 2011/04/26 17:40:38 ahoka Exp $ */
/*-
* Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.31 2011/02/17 19:27:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.32 2011/04/26 17:40:38 ahoka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -221,7 +221,7 @@
KASSERT((l->l_flag & LW_SYSTEM) != 0);
KASSERT((l->l_prflag & LPR_DETACHED) == 0);
- p = l->l_proc;
+ p = curlwp->l_proc;
mutex_enter(p->p_lock);
error = lwp_wait1(curlwp, l->l_lid, &departed, LWPWAIT_EXITCONTROL);
