From owner-p4-projects@FreeBSD.ORG  Tue Jan 16 10:18:59 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D535E16A417; Tue, 16 Jan 2007 10:18:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 947F916A415
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:18:58 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C5CF613C455
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:18:57 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0GAIvZg081931
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:18:57 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0GAIvIL081928
	for perforce@freebsd.org; Tue, 16 Jan 2007 10:18:57 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 16 Jan 2007 10:18:57 GMT
Message-Id: <200701161018.l0GAIvIL081928@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112981 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: Tue, 16 Jan 2007 10:18:59 -0000

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

Change 112981 by piso@piso_newluxor on 2007/01/16 10:18:52

	Move spin lock acquisition for the callout path into the 
	interrupt scanning function, and add the callout_init() call
	that ought to be there.

Affected files ...

.. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#26 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#26 (text+ko) ====

@@ -123,6 +123,7 @@
 		panic("intr_init: unable to allocate interrupt handler array");
 
 	mtx_init(&ppc_intrs_lock, "intr table", NULL, MTX_SPIN);
+	callout_init(&stray_callout_handle, 1);
 
 	irq_enable = irq_e;
 
@@ -286,7 +287,9 @@
 
 	for (; i < ppc_nintrs; ) {
 		j = i++;
+		mtx_lock_spin(&ppc_intrs_lock);
 		intr = ppc_intrs[j];
+		mtx_unlock_spin(&ppc_intrs_lock);
 		if (intr != NULL && intr->event != NULL)
 			return (intr->event);
 	}
@@ -297,11 +300,9 @@
 void
 intr_callout_reset(void) 
 {
-
-	mtx_lock_spin(&ppc_intrs_lock);
+	
 	callout_reset(&stray_callout_handle, hz, &stray_detection, 
-	    &walk_intr_ppc);
-	mtx_unlock_spin(&ppc_intrs_lock);
+	    &walk_intr_ppc);	
 }
 
 void