Suspended LWPs are no longer created with l_mutex == spc_mutex. Remove

workaround in setrunnable. Fixes PR kern/38222.
This commit is contained in:
ad 2008-04-29 13:56:14 +00:00
parent 67fa15fb98
commit 0910800372
1 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_synch.c,v 1.235 2008/04/28 22:15:47 ad Exp $ */ /* $NetBSD: kern_synch.c,v 1.236 2008/04/29 13:56:14 ad Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -94,7 +94,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.235 2008/04/28 22:15:47 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.236 2008/04/29 13:56:14 ad Exp $");
#include "opt_kstack.h" #include "opt_kstack.h"
#include "opt_lockdebug.h" #include "opt_lockdebug.h"
@ -949,10 +949,8 @@ setrunnable(struct lwp *l)
*/ */
ci = sched_takecpu(l); ci = sched_takecpu(l);
l->l_cpu = ci; l->l_cpu = ci;
if (l->l_mutex != l->l_cpu->ci_schedstate.spc_mutex) { spc_lock(ci);
lwp_unlock_to(l, ci->ci_schedstate.spc_mutex); lwp_unlock_to(l, ci->ci_schedstate.spc_mutex);
lwp_lock(l);
}
sched_setrunnable(l); sched_setrunnable(l);
l->l_stat = LSRUN; l->l_stat = LSRUN;
l->l_slptime = 0; l->l_slptime = 0;