Module Name: src
Committed By: matt
Date: Wed Dec 22 06:06:19 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: trap.c
Log Message:
Add a check to more the ASID is valid on a user fault.
To generate a diff of this commit:
cvs rdiff -u -r1.217.12.30 -r1.217.12.31 src/sys/arch/mips/mips/trap.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/arch/mips/mips/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217.12.30 src/sys/arch/mips/mips/trap.c:1.217.12.31
--- src/sys/arch/mips/mips/trap.c:1.217.12.30 Mon Aug 16 23:38:01 2010
+++ src/sys/arch/mips/mips/trap.c Wed Dec 22 06:06:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.217.12.30 2010/08/16 23:38:01 matt Exp $ */
+/* $NetBSD: trap.c,v 1.217.12.31 2010/12/22 06:06:19 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.30 2010/08/16 23:38:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.31 2010/12/22 06:06:19 matt Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -401,6 +401,8 @@
return; /* GEN */
}
#endif
+ KASSERT(va < 0 || ci->ci_pmap_asid_cur != 0);
+ pmap_tlb_asid_check();
#ifdef PMAP_FAULTINFO
if (p->p_pid == pfi->pfi_lastpid && va == pfi->pfi_faultaddr) {
