From owner-p4-projects@FreeBSD.ORG  Thu Mar  6 19:50:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4ABC1065717; Thu,  6 Mar 2008 19:50:13 +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 63988106566C
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 19:50:13 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 528708FC24
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 19:50:13 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m26JoDes034772
	for <perforce@freebsd.org>; Thu, 6 Mar 2008 19:50:13 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m26JoDXx034770
	for perforce@freebsd.org; Thu, 6 Mar 2008 19:50:13 GMT
	(envelope-from rrs@cisco.com)
Date: Thu, 6 Mar 2008 19:50:13 GMT
Message-Id: <200803061950.m26JoDXx034770@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137019 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, 06 Mar 2008 19:50:14 -0000

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

Change 137019 by rrs@rrs-mips2-jnpr on 2008/03/06 19:49:46

	The ast was in the wrong place causing all kinds of pain.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#21 edit

Differences ...

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

@@ -392,12 +392,6 @@
 	jalr	k0
 	sw	a3, STAND_RA_OFFSET + KERN_REG_SIZE(sp)		# for debugging
 
-/*	.set	at*/
-
-/* Should I DO the AST stuff here? */
-	
-/*	.set	noat*/
-
 	RESTORE_CPU			# v0 contains the return address.
 	sync
 	eret
@@ -497,14 +491,14 @@
  * Restore user registers and return.
  * First disable interrupts and set exeption level.
  */
+	DO_AST
+
 	mtc0	zero, COP_0_STATUS_REG	# disable int
 	ITLBNOPFIX
 	li	v0, SR_EXL
 	mtc0	v0, COP_0_STATUS_REG	# set exeption level
 	ITLBNOPFIX
 
-	DO_AST
-	
 /*
  * The use of k1 for storing the PCB pointer must be done only
  * after interrupts are disabled.  Otherwise it will get overwritten