From owner-p4-projects@FreeBSD.ORG  Thu Oct 30 22:42:59 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5C6A116A4D3; Thu, 30 Oct 2003 22:42:59 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DCC6816A4DB
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 22:42:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D895843FBD
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 22:42:57 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9V6gvXJ028340
	for <perforce@freebsd.org>; Thu, 30 Oct 2003 22:42:57 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9V6gvXD028336
	for perforce@freebsd.org; Thu, 30 Oct 2003 22:42:57 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Thu, 30 Oct 2003 22:42:57 -0800 (PST)
Message-Id: <200310310642.h9V6gvXD028336@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40945 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2003 06:43:00 -0000

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

Change 40945 by jmallett@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);
 }