[src/trunk]: src/sys/arch/mips/mips Set iospace and virtual_end address prope...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/451af2f01a39
branches:  trunk
changeset: 765948:451af2f01a39
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jun 12 01:28:29 2011 +0000

description:
Set iospace and virtual_end address properly.
Fixes TLB miss panic during device attach on emips.

diffstat:

 sys/arch/mips/mips/pmap.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 0ad65f671ba4 -r 451af2f01a39 sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Sun Jun 12 00:07:19 2011 +0000
+++ b/sys/arch/mips/mips/pmap.c Sun Jun 12 01:28:29 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.201 2011/05/07 14:37:46 tsutsui Exp $       */
+/*     $NetBSD: pmap.c,v 1.202 2011/06/12 01:28:29 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.201 2011/05/07 14:37:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.202 2011/06/12 01:28:29 tsutsui Exp $");
 
 /*
  *     Manages physical address maps.
@@ -555,12 +555,12 @@
 
 #ifndef _LP64
        /* Need space for I/O (not in K1SEG) ? */
-       mips_virtual_end += iospace_size;
 
        if (mips_virtual_end > VM_MAX_KERNEL_ADDRESS) {
                mips_virtual_end = VM_MAX_KERNEL_ADDRESS;
                Sysmapsize =
-                   (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) / NBPG;
+                   (VM_MAX_KERNEL_ADDRESS -
+                    (VM_MIN_KERNEL_ADDRESS + iospace_size)) / NBPG;
        }
 
        if (iospace_size) {