Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from vmlocking: relax an assertion if panicstr != NULL.

This commit is contained in:
ad 2007-10-08 14:07:08 +00:00
parent 4de14a3313
commit 0b87fda284
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_condvar.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_condvar.c,v 1.12 2007/08/02 22:01:40 ad Exp $ */
/* $NetBSD: kern_condvar.c,v 1.13 2007/10/08 14:07:08 ad Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.12 2007/08/02 22:01:40 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.13 2007/10/08 14:07:08 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@ -110,7 +110,7 @@ cv_enter(kcondvar_t *cv, kmutex_t *mtx, lwp_t *l)
sleepq_t *sq;
KASSERT(cv->cv_wmesg != deadcv && cv->cv_wmesg != NULL);
KASSERT((l->l_flag & LW_INTR) == 0);
KASSERT((l->l_flag & LW_INTR) == 0 || panicstr != NULL);
l->l_cv_signalled = 0;
sq = sleeptab_lookup(&sleeptab, cv);