From owner-p4-projects@FreeBSD.ORG  Thu Mar  6 19:49:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55A361065674; Thu,  6 Mar 2008 19:49:12 +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 15B6F1065672
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 19:49:12 +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 0469B8FC1D
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 19:49:12 +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 m26JnBCf034700
	for <perforce@freebsd.org>; Thu, 6 Mar 2008 19:49:11 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m26JnBw6034694
	for perforce@freebsd.org; Thu, 6 Mar 2008 19:49:11 GMT
	(envelope-from rrs@cisco.com)
Date: Thu, 6 Mar 2008 19:49:11 GMT
Message-Id: <200803061949.m26JnBw6034694@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 137017 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:49:13 -0000

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

Change 137017 by rrs@rrs-mips2-jnpr on 2008/03/06 19:48:17

	AST's should not be done in trap, the exception code
	       does this.

Affected files ...

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

Differences ...

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

@@ -260,7 +260,7 @@
  * kdbpeekD(addr) - skip one word starting at 'addr', then read the second word
  */
 #define	kdbpeekD(addr)	kdbpeek(((int *)(addr)) + 1)
-
+int rrs_debug = 0;
 
 /*
  * MIPS load/store access type
@@ -838,9 +838,6 @@
 			PTRACESTOP_SC(p, td, S_PT_SCX);
 
 			mtx_assert(&Giant, MA_NOTOWNED);
-			if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
-				ast(trapframe);
-			}
 			return (trapframe->pc);
 		}
 
@@ -1029,9 +1026,9 @@
 			printf("kernel mode)\n");
 
 #ifdef TRAP_DEBUG
-		printf("badvaddr = %p, pc = %p, ra = %p, sr = 0x%x\n",
-		    trapframe->badvaddr, trapframe->pc, trapframe->ra,
-		    trapframe->sr);
+		printf("badvaddr = %x, pc = %x, ra = %x, sr = 0x%x\n",
+		       trapframe->badvaddr, trapframe->pc, trapframe->ra,
+		       trapframe->sr);
 #endif
 
 #ifdef KDB
@@ -1057,9 +1054,6 @@
 	 */
 	userret(td, trapframe);
 	mtx_assert(&Giant, MA_NOTOWNED);
-	if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
-		ast(trapframe);
-	}
 	return (trapframe->pc);
 }