From owner-p4-projects@FreeBSD.ORG  Sun Jan 18 02:32:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C68F416A4D0; Sun, 18 Jan 2004 02:32:17 -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 9A4BE16A4CE
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 02:32:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 98F0643D31
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 02:32:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0IAWG0B012764
	for <perforce@freebsd.org>; Sun, 18 Jan 2004 02:32:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0IAWGYx012758
	for perforce@freebsd.org; Sun, 18 Jan 2004 02:32:16 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 18 Jan 2004 02:32:16 -0800 (PST)
Message-Id: <200401181032.i0IAWGYx012758@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 45527 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: Sun, 18 Jan 2004 10:32:18 -0000

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

Change 45527 by jmallett@jmallett_oingo on 2004/01/18 02:31:59

	Cleanup attempts, etc.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/exception.S#12 edit
.. //depot/projects/mips/sys/mips/mips/tlb.c#20 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#12 (text+ko) ====

@@ -204,6 +204,7 @@
 	nop
 	nop
 	eret
+	.set at
 VEND(XTLBMissVector)
 
 /*

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

@@ -153,8 +153,8 @@
 	tlb_remove_pages(pmap, va, eva - va);
 }
 
-static void
-tlb_insert(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
+void
+tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
 	u_long ehi;
 	int i;
@@ -212,13 +212,6 @@
 		tlb_invalidate_one(va);
 }
 
-void
-tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
-{
-	va &= ~PAGE_MASK;
-	tlb_insert(va, pte0, pte1);
-}
-
 /*
  * PTE was not dirty and is being written to.  XXX kernel only for now.
  */
@@ -238,19 +231,8 @@
 		panic("write to invalid page");
 	if (pte_ro(pte))
 		panic("write to ro page");
-
- 	/*
-	 * XXX I don't like these, but it looks like the fact of the
-	 * matter is that they happen, for example I have something in
-	 * front of me right now where the even side of the buffer is
-	 * dirty, and so is the odd side, but in the buffer, the left
-	 * side is marked, and there's some reason why a reload didn't
-	 * happen, so just let it go... let it go...
-	 */
-#if 0
 	if (pte_dirty(pte))
 		panic("dirty page caused a TLBMod");
-#endif
 
 	/*
 	 * Mark the page dirty.