Module Name: src
Committed By: tsutsui
Date: Sun Jun 12 01:28:29 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
Set iospace and virtual_end address properly.
Fixes TLB miss panic during device attach on emips.
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/mips/mips/pmap.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.c
diff -u src/sys/arch/mips/mips/pmap.c:1.201 src/sys/arch/mips/mips/pmap.c:1.202
--- src/sys/arch/mips/mips/pmap.c:1.201 Sat May 7 14:37:46 2011
+++ src/sys/arch/mips/mips/pmap.c Sun Jun 12 01:28:29 2011
@@ -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) {
