From owner-p4-projects@FreeBSD.ORG  Thu Feb 14 18:32:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3297016A420; Thu, 14 Feb 2008 18:32:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EC34C16A418
	for <perforce@FreeBSD.org>; Thu, 14 Feb 2008 18:32:19 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EE5D713C44B
	for <perforce@FreeBSD.org>; Thu, 14 Feb 2008 18:32:19 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1EIWJdT013024
	for <perforce@FreeBSD.org>; Thu, 14 Feb 2008 18:32:19 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1EIWJ9U013021
	for perforce@freebsd.org; Thu, 14 Feb 2008 18:32:19 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Thu, 14 Feb 2008 18:32:19 GMT
Message-Id: <200802141832.m1EIWJ9U013021@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135390 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 14 Feb 2008 18:32:20 -0000

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

Change 135390 by gonzo@gonzo_jeeves on 2008/02/14 18:32:01

	o Fix MCHECK exception in mips_TBIAP by generating sequential 
	    bogus address values instead of using only one for every 
	    TLB entry.
	Tested by:	rrs

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#7 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#7 (text+ko) ====

@@ -473,7 +473,7 @@
 	_MFC0	t4, COP_0_TLB_HI		# Get current PID
 	move	t2, a0
 	mfc0	t1, COP_0_TLB_WIRED
-	li	v0, MIPS_KSEG0_START		# invalid address
+	li	v0, MIPS_KSEG0_START + 0x0fff0000	# invalid address
 	mfc0	t3, COP_0_TLB_PG_MASK		# save current pgMask
 
 	# do {} while (t1 < t2)
@@ -495,6 +495,7 @@
 	tlbwi					# invalidate the TLB entry
 2:
 	addu	t1, t1, 1
+	addu	v0, 1 << (PAGE_SHIFT + 1)
 	bne	t1, t2, 1b
 	nop