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

mi_switch: remove invalid assert and add a note that preemption/interrupt 

may happen while migrating LWP is set.

Reported by Manuel Bouyer.
This commit is contained in:
rmind 2010-12-18 01:13:36 +00:00
parent 628e094cdc
commit a5d3437d2b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_synch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_synch.c,v 1.284 2010/11/02 15:17:37 pooka Exp $ */
/* $NetBSD: kern_synch.c,v 1.285 2010/12/18 01:13:36 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.284 2010/11/02 15:17:37 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.285 2010/12/18 01:13:36 rmind Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@ -654,9 +654,13 @@ mi_switch(lwp_t *l)
l->l_stat = LSRUN;
lwp_setlock(l, spc->spc_mutex);
sched_enqueue(l, true);
/* Handle migration case */
KASSERT(spc->spc_migrating == NULL);
if (l->l_target_cpu != NULL) {
/*
* Handle migration. Note that "migrating LWP" may
* be reset here, if interrupt/preemption happens
* early in idle LWP.
*/
if (l->l_target_cpu != NULL) {
KASSERT((l->l_pflag & LP_INTR) == 0);
spc->spc_migrating = l;
}
} else