Module Name: src
Committed By: matt
Date: Mon Aug 16 23:26:28 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: trap.c
Log Message:
Only set seg0tab if the va would be in seg0 tab.
To generate a diff of this commit:
cvs rdiff -u -r1.217.12.28 -r1.217.12.29 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.28 src/sys/arch/mips/mips/trap.c:1.217.12.29
--- src/sys/arch/mips/mips/trap.c:1.217.12.28 Mon Aug 16 18:01:13 2010
+++ src/sys/arch/mips/mips/trap.c Mon Aug 16 23:26:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.217.12.28 2010/08/16 18:01:13 matt Exp $ */
+/* $NetBSD: trap.c,v 1.217.12.29 2010/08/16 23:26:28 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.28 2010/08/16 18:01:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.29 2010/08/16 23:26:28 matt Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -391,8 +391,9 @@
* cpu's cpu_info but not other cpu's) so we need to detect
* and fix this here.
*/
- if (__predict_false(ci->ci_pmap_seg0tab == NULL &&
- ci->ci_pmap_segtab->seg_seg[0] != NULL)) {
+ if ((va >> 31) == 0 &&
+ __predict_false(ci->ci_pmap_seg0tab == NULL
+ && ci->ci_pmap_segtab->seg_seg[0] != NULL)) {
ci->ci_pmap_seg0tab = ci->ci_pmap_segtab->seg_seg[0];
if (type & T_USER) {
userret(l);
