From owner-p4-projects@FreeBSD.ORG  Fri May 28 14:31:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B33F516A4D0; Fri, 28 May 2004 14:31:24 -0700 (PDT)
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 8494B16A4CE
	for <perforce@freebsd.org>; Fri, 28 May 2004 14:31:24 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7CA0B43D1F
	for <perforce@freebsd.org>; Fri, 28 May 2004 14:31:24 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SLVJ0A070485
	for <perforce@freebsd.org>; Fri, 28 May 2004 14:31:19 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SLVHKg070461
	for perforce@freebsd.org; Fri, 28 May 2004 14:31:17 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 28 May 2004 14:31:17 -0700 (PDT)
Message-Id: <200405282131.i4SLVHKg070461@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 53690 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: Fri, 28 May 2004 21:31:25 -0000

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

Change 53690 by rwatson@rwatson_paprika on 2004/05/28 14:30:56

	Selective integrate of ithread preemption fix from FreeBSD
	CVS HEAD to netperf_socket branch.

Affected files ...

.. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#3 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.5 2004/05/04 21:02:56 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.6 2004/05/28 17:50:07 jhb Exp $
  */
 
 /*
@@ -183,7 +183,6 @@
 	if (vector == 0)
 		clkintr_pending = 1;
 
-	critical_enter();
 	if (ih != NULL && ih->ih_flags & IH_FAST) {
 		/*
 		 * Execute fast interrupt handlers directly.
@@ -191,6 +190,7 @@
 		 * with a NULL argument, then we pass it a pointer to
 		 * a trapframe as its argument.
 		 */
+		critical_enter();
 		TAILQ_FOREACH(ih, &it->it_handlers, ih_next) {
 			MPASS(ih->ih_flags & IH_FAST);
 			CTR3(KTR_INTR, "%s: executing handler %p(%p)",
@@ -204,6 +204,7 @@
 		}
 		isrc->is_pic->pic_eoi_source(isrc);
 		error = 0;
+		critical_exit();
 	} else {
 		/*
 		 * For stray and threaded interrupts, we mask and EOI the
@@ -216,7 +217,6 @@
 		else
 			error = ithread_schedule(it, !cold);
 	}
-	critical_exit();
 	if (error == EINVAL) {
 		atomic_add_long(isrc->is_straycount, 1);
 		if (*isrc->is_straycount < MAX_STRAY_LOG)