From owner-p4-projects@FreeBSD.ORG  Wed Feb  6 00:33:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C76B16A419; Wed,  6 Feb 2008 00:33:33 +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 624B116A417
	for <perforce@freebsd.org>; Wed,  6 Feb 2008 00:33:33 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C80313C45A
	for <perforce@freebsd.org>; Wed,  6 Feb 2008 00:33:33 +0000 (UTC)
	(envelope-from imp@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 m160XWV4030814
	for <perforce@freebsd.org>; Wed, 6 Feb 2008 00:33:32 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m160XWMD030811
	for perforce@freebsd.org; Wed, 6 Feb 2008 00:33:32 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 6 Feb 2008 00:33:32 GMT
Message-Id: <200802060033.m160XWMD030811@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134864 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: Wed, 06 Feb 2008 00:33:34 -0000

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

Change 134864 by imp@imp_lighthouse on 2008/02/06 00:33:22

	Get ASTs kinda sorta working, some of the time...  this is lame
	and likely needs to be torn our of trap.c and moved to exception.S
	to get it to really work...

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#9 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#9 (text+ko) ====

@@ -828,7 +828,6 @@
 
 		PTRACESTOP_SC(p, td, S_PT_SCX);
 
-#ifdef GONE_IN_7
 		/*
 		 * XXX ast still need to happen
 		 *
@@ -872,7 +871,6 @@
 		if (curthread->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) {
 			ast(trapframe);
 		}
-#endif
 		return (trapframe->pc);
 	    }
 
@@ -1080,11 +1078,8 @@
 	 */
 	userret(td, trapframe);
 	mtx_assert(&Giant, MA_NOTOWNED);
-#ifdef GONE_IN_7
-	if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
+	if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED))
 		ast(trapframe);
-	}
-#endif
 	return (trapframe->pc);
 }