Module Name: src
Committed By: skrll
Date: Thu Nov 12 10:47:30 UTC 2015
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
Drop to spl0 after the pmap_activate call. Should address
PR port-arm/50420: curcpu()->ci_pmap_cur != pm || pm->pm_pai[0].pai_asid ==
curcpu()->ci_pmap_asid_cur" failed
Discussed with matt@ and rmind@
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/kern/kern_lwp.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_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.180 src/sys/kern/kern_lwp.c:1.181
--- src/sys/kern/kern_lwp.c:1.180 Fri Oct 2 16:54:15 2015
+++ src/sys/kern/kern_lwp.c Thu Nov 12 10:47:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.180 2015/10/02 16:54:15 christos Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.181 2015/11/12 10:47:30 skrll Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.180 2015/10/02 16:54:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.181 2015/11/12 10:47:30 skrll Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -992,9 +992,9 @@ lwp_startup(struct lwp *prev, struct lwp
prev->l_ctxswtch = 0;
}
KPREEMPT_DISABLE(new_lwp);
- spl0();
if (__predict_true(new_lwp->l_proc->p_vmspace))
pmap_activate(new_lwp);
+ spl0();
/* Note trip through cpu_switchto(). */
pserialize_switchpoint();
