PERFORCE change 40945 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=40945

Change 40945 by jmallett at jmallett_sprout on 2003/10/30 22:42:05

	Either some dumbwit (me) confused PAGE_SIZE and PAGE_MASK
	at some point, or some drunkard (again, me) is confused by
	their use right now.  Assume the former, be prepared for the
	latter.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/tlb.c#4 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/tlb.c#4 (text+ko) ====

@@ -121,8 +121,10 @@
 void
 tlb_remove_pages(pmap_t pmap, vm_offset_t va, int pages)
 {
+	va &= ~PAGE_MASK;
 	while (pages--) {
 		tlb_remove(pmap, va);
+		va += PAGE_SIZE;
 	}
 }
 
@@ -135,7 +137,7 @@
 void
 tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
-	va &= ~PAGE_SIZE;
+	va &= ~PAGE_MASK;
 	critical_enter();
 	/* XXX assumes kernel region - region 3. */
 	mips_wr_entryhi(MIPS_HI_R_KERNEL | MIPS_HI_VA_TO_VPN2(va) /* XXX | ASID */);
@@ -148,7 +150,7 @@
 void
 tlb_invalidate_page(vm_offset_t va)
 {
-	va &= ~PAGE_SIZE;
+	va &= ~PAGE_MASK;
 #if 0 /* XXX NetBSD code is faulty.  Invalidate ALL. */
 	MIPS_TBIS(va);
 #else
@@ -159,7 +161,7 @@
 void
 tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
-	va &= ~PAGE_SIZE;
+	va &= ~PAGE_MASK;
 	tlb_invalidate_page(va);
 	tlb_insert(va, pte0, pte1);
 }