CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Feb 25 05:24:24 UTC 2010

Modified Files:
        src/sys/arch/mips/mips [matt-nb5-mips64]: pmap_segtab.c

Log Message:
Make sure we aren't looking up a direct-mapped address.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/mips/pmap_segtab.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/pmap_segtab.c
diff -u src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.5 src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.6
--- src/sys/arch/mips/mips/pmap_segtab.c:1.1.2.5	Tue Feb 23 20:33:48 2010
+++ src/sys/arch/mips/mips/pmap_segtab.c	Thu Feb 25 05:24:24 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_segtab.c,v 1.1.2.5 2010/02/23 20:33:48 matt Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.1.2.6 2010/02/25 05:24:24 matt Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.1.2.5 2010/02/23 20:33:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.1.2.6 2010/02/25 05:24:24 matt Exp $");
 
 /*
  *	Manages physical address maps.
@@ -149,6 +149,11 @@
 pmap_segmap(struct pmap *pmap, vaddr_t va)
 {
 	struct segtab *stp = pmap->pm_segtab;
+	KASSERT(!MIPS_KSEG0_P(va));
+	KASSERT(!MIPS_KSEG1_P(va));
+#ifdef _LP64
+	KASSERT(!MIPS_XKPHYS_P(va));
+#endif
 	return stp->seg_tab[va >> SEGSHIFT];
 }