From owner-p4-projects@FreeBSD.ORG  Fri Mar 12 11:05:13 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D63E416A4D4; Fri, 12 Mar 2004 11:05:13 -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 910B216A4FC
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 11:05:13 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 75B4643D1F
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 11:05:13 -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 i2CJ5DGe056895
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 11:05:13 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2CJ5DMV056891
	for perforce@freebsd.org; Fri, 12 Mar 2004 11:05:13 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Fri, 12 Mar 2004 11:05:13 -0800 (PST)
Message-Id: <200403121905.i2CJ5DMV056891@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 48804 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, 12 Mar 2004 19:05:14 -0000

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

Change 48804 by jmallett@jmallett_oingo on 2004/03/12 11:05:04

	All I ever needed is one nop before eret.
	Don't pretend this is more special than it is.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/exception.S#18 edit

Differences ...

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

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/mips/exception.S#17 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#18 $
  */
 
 #include "opt_ddb.h"
@@ -197,10 +197,8 @@
 	 */
 	dmtc0	k0, MIPS_COP_0_TLB_LO0
 	dmtc0	k1, MIPS_COP_0_TLB_LO1
+	nop
 	tlbwr
-	nop
-	nop
-	nop
 	eret
 	.set at
 VEND(XTLBMissVector)