From owner-p4-projects@FreeBSD.ORG  Mon Mar 15 11:56:30 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E77416A4CF; Mon, 15 Mar 2004 11:56:30 -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 B924916A4D1
	for <perforce@freebsd.org>; Mon, 15 Mar 2004 11:56:29 -0800 (PST)
Received: from mail2.speakeasy.net (mail2.speakeasy.net [216.254.0.202])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 82AF243D49
	for <perforce@freebsd.org>; Mon, 15 Mar 2004 11:56:29 -0800 (PST)
	(envelope-from jhb@FreeBSD.org)
Received: (qmail 24268 invoked from network); 15 Mar 2004 19:56:28 -0000
Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx)
	([216.27.160.63])          (envelope-sender <jhb@FreeBSD.org>)
	encrypted SMTP
	for <perforce@freebsd.org>; 15 Mar 2004 19:56:28 -0000
Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1])
	by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i2FJt42F059716;
	Mon, 15 Mar 2004 14:56:25 -0500 (EST)
	(envelope-from jhb@FreeBSD.org)
From: John Baldwin <jhb@FreeBSD.org>
To: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 15 Mar 2004 11:47:41 -0500
User-Agent: KMail/1.6
References: <200403130837.i2D8b9wv054555@repoman.freebsd.org>
In-Reply-To: <200403130837.i2D8b9wv054555@repoman.freebsd.org>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <200403151147.41616.jhb@FreeBSD.org>
X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx
cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 48876 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: Mon, 15 Mar 2004 19:56:30 -0000

On Saturday 13 March 2004 03:37 am, Juli Mallett wrote:
> ==== //depot/projects/mips/sys/mips/mips/trap.c#17 (text+ko) ====
>
> @@ -40,6 +40,7 @@
>  #include <machine/pte.h>
>  #include <machine/tlb.h>
>  #include <machine/trap.h>
> +#include <machine/hwfunc.h>
>
>  #ifdef DDB
>  #include <machine/db_machdep.h>
> @@ -108,6 +109,12 @@
>  		tlb_modified(badvaddr);
>  		platform_trap_exit();
>  		return;
> +	case TrInt:
> +		platform_trap_exit();
> +		atomic_add_int(&curthread->td_intr_nesting_level, 1);
> +		platform_intr(tf);
> +		atomic_subtract_int(&curthread->td_intr_nesting_level, 1);
> +		return;
>  	default:
>  		/* Fatal! */
>  		break;

Note that if interrupts are disabled on the CPU when this is called, you don't 
need to use atomic ops to dink with the nesting level.

-- 
John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org