PERFORCE change 115419 for review

[Paolo Pisati]

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

Change 115419 by piso at piso_newluxor on 2007/03/06 15:20:16

	IFC at 115411

Affected files ...

.. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#10 integrate
.. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#7 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_pci.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#8 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_alq.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#7 integrate

Differences ...

==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#10 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.12 2007/02/25 14:34:59 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.13 2007/03/06 10:55:57 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#7 (text+ko) ====

@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.8 2007/02/23 12:18:27 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.9 2007/03/06 10:56:54 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_pci.c#5 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.3 2007/02/23 12:18:28 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#7 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.25 2007/02/23 12:18:49 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.26 2007/03/06 11:44:11 piso Exp $");
 #include "opt_ppb_1284.h"
 
 #include <sys/param.h>

==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#8 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.55 2007/02/23 23:05:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.56 2007/03/06 11:36:33 piso Exp $");
 
 #include "opt_ppc.h"
 

==== //depot/projects/soc2006/intr_filter/kern/kern_alq.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.17 2007/03/04 23:40:35 wkoszek Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.18 2007/03/06 12:08:38 cognet Exp $");
 
 #include "opt_mac.h"
 
@@ -224,7 +224,9 @@
 	/* Drain IO */
 	while (alq->aq_flags & (AQ_FLUSHING|AQ_ACTIVE)) {
 		alq->aq_flags |= AQ_WANTED;
-		msleep(alq, &(alq)->aq_mtx, PWAIT, "aldclose", 0);
+		ALQ_UNLOCK(alq);
+		tsleep(alq, PWAIT, "aldclose", 0);
+		ALQ_LOCK(alq);
 	}
 	ALQ_UNLOCK(alq);
 
@@ -431,7 +433,9 @@
 	    (ale = alq->aq_entfree) == NULL &&
 	    (waitok & ALQ_WAITOK)) {
 		alq->aq_flags |= AQ_WANTED;
-		msleep(alq, &(alq)->aq_mtx, PWAIT, "alqget", 0);
+		ALQ_UNLOCK(alq);
+		tsleep(alq, PWAIT, "alqget", 0);
+		ALQ_LOCK(alq);
 	}
 
 	if (ale != NULL) {

==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/upa.c,v 1.6 2007/02/23 12:19:06 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/upa.c,v 1.7 2007/03/06 12:19:37 piso Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>