CVS commit: src/sys/arch/mips/mips

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Wed Mar  2 13:26:42 UTC 2011

Modified Files:
        src/sys/arch/mips/mips: pmap.c

Log Message:
Make this compile with PMAP_POOLPAGE_DEBUG.
XXX: not sure if this is ever used


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 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.196 src/sys/arch/mips/mips/pmap.c:1.197
--- src/sys/arch/mips/mips/pmap.c:1.196	Fri Feb 25 19:32:51 2011
+++ src/sys/arch/mips/mips/pmap.c	Wed Mar  2 13:26:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.196 2011/02/25 19:32:51 tsutsui Exp $	*/
+/*	$NetBSD: pmap.c,v 1.197 2011/03/02 13:26:41 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.196 2011/02/25 19:32:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.197 2011/03/02 13:26:41 tsutsui Exp $");
 
 /*
  *	Manages physical address maps.
@@ -581,9 +581,9 @@
 	    uvm_pageboot_alloc(sizeof(pt_entry_t) * Sysmapsize);
 
 #ifdef PMAP_POOLPAGE_DEBUG
-	mips_virtual_end -= poolpage.limit;
+	mips_virtual_end -= poolpage.size;
 	poolpage.base = mips_virtual_end;
-	poolpage.sysmap += Sysmap + atop(poolpage.size);
+	poolpage.sysmap = Sysmap + atop(poolpage.size);
 #endif
 	/*
 	 * Initialize the pools.
@@ -2598,7 +2598,7 @@
 	KASSERT(!mips_pg_v(pte->pt_entry));
 	va = poolpage.base + va_offset;
 	poolpage.hint = roundup2(va_offset + 1, va_inc);
-	pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PORT_WRITE);
+	pmap_kenter_pa(va, pa, VM_PROT_READ|VM_PROT_WRITE, 0);
 #else
 #ifdef _LP64
 	KASSERT(mips_options.mips3_xkphys_cached);
@@ -2635,7 +2635,7 @@
 {
 	paddr_t pa;
 #ifdef PMAP_POOLPAGE_DEBUG
-	KASSERT(poolpage.start <= va && va < poolpage.start + poolpage.size);
+	KASSERT(poolpage.base <= va && va < poolpage.base + poolpage.size);
 	pa = mips_tlbpfn_to_paddr(kvtopte(va)->pt_entry);
 #elif defined(_LP64)
 	KASSERT(MIPS_XKPHYS_P(va));