From owner-p4-projects@FreeBSD.ORG  Sun Jun 13 07:38:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0FE2916A4D1; Sun, 13 Jun 2004 07:38:02 +0000 (GMT)
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 DDFE216A4CE
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 07:38:01 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D741D43D39
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 07:38:01 +0000 (GMT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5D7ao87056034
	for <perforce@freebsd.org>; Sun, 13 Jun 2004 07:36:50 GMT
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5D7ao31056031
	for perforce@freebsd.org; Sun, 13 Jun 2004 07:36:50 GMT
	(envelope-from jmallett@freebsd.org)
Date: Sun, 13 Jun 2004 07:36:50 GMT
Message-Id: <200406130736.i5D7ao31056031@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 54799 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, 13 Jun 2004 07:38:02 -0000

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

Change 54799 by jmallett@jmallett_oingo on 2004/06/13 07:35:58

	Ignore return value of trap()

Affected files ...

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

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#28 (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#27 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#28 $
  */
 
 #include "opt_ddb.h"
@@ -129,8 +129,6 @@
 	 * trapframe, cause, badvaddr.
 	 *
 	 * The trapframe is copied from k1 to a0 in the BDslot.
-	 *
-	 * trap returns the frame.
 	 */
 	mfc0	a1, MIPS_COP_0_CAUSE
 	dmfc0	a2, MIPS_COP_0_BAD_VADDR
@@ -145,7 +143,7 @@
 	li	t0, MIPS_SR_KX
 	mtc0	t0, MIPS_COP_0_STATUS
 
-	move	k1, v0
+	move	k1, sp
 	jal	exception_restore_registers
 	nop
 	daddu	sp, sp, TF_SIZE