From owner-p4-projects@FreeBSD.ORG  Tue Jan 16 10:05:40 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 D4FF416A415; Tue, 16 Jan 2007 10:05:39 +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 AE20716A407
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:05:39 +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 9E3E613C442
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:05:39 +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 l0GA5dT4080168
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 10:05:39 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0GA5deK080165
	for perforce@freebsd.org; Tue, 16 Jan 2007 10:05:39 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 16 Jan 2007 10:05:39 GMT
Message-Id: <200701161005.l0GA5deK080165@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 112977 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:05:40 -0000

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

Change 112977 by piso@piso_newluxor on 2007/01/16 10:05:22

	Get rid of the lock in the callout path.
	While here, fix some spacing and indentation.

Affected files ...

.. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#28 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#28 (text+ko) ====

@@ -217,9 +217,10 @@
 walk_intrs_src(void) {
 	struct intsrc *isrc;
 	static int i = 0;
+	int j;
 
-	for (; i < NUM_IO_INTS; ) {
-		int j = i++;
+	for (; i < NUM_IO_INTS;) {
+		j = i++;
 		isrc = interrupt_sources[j];
 		if (isrc != NULL && isrc->is_event != NULL)
 			return (isrc->is_event);
@@ -284,10 +285,8 @@
 intr_callout_reset(void)
 {
 
-	mtx_lock_spin(&intr_table_lock);
 	callout_reset(&stray_callout_handle, hz, 
-		      &stray_detection, &walk_intrs_src);
-	mtx_unlock_spin(&intr_table_lock);
+	    &stray_detection, &walk_intrs_src);
 }
 
 static void
@@ -385,7 +384,7 @@
 	intrcnt_index = 1;
 	STAILQ_INIT(&pics);
 	mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN);
-	callout_init_mtx(&stray_callout_handle, &intr_table_lock, 0);
+	callout_init(&stray_callout_handle, 1);
 	// XXX - we don't drain the callout...
 }
 SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL)