PERFORCE change 52194 for review

[Robert Watson]

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

Change 52194 by rwatson at rwatson_tislabs on 2004/05/03 19:34:49

	Integrate netperf_socket: pccbb uses INTR_MPSAFE when
	re-registering.

Affected files ...

.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#8 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#8 (text+ko) ====

@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.109 2004/04/23 05:25:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.110 2004/05/04 02:25:00 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2057,8 +2057,8 @@
 	cbb_set(sc, CBB_SOCKET_EVENT, tmp);
 
 	/* re-establish the interrupt. */
-	if (bus_setup_intr(self, sc->irq_res, INTR_TYPE_AV, cbb_intr, sc,
-	    &sc->intrhand)) {
+	if (bus_setup_intr(self, sc->irq_res, INTR_TYPE_AV | INTR_MPSAFE,
+	    cbb_intr, sc, &sc->intrhand)) {
 		device_printf(self, "couldn't re-establish interrupt");
 		bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res);
 		bus_release_resource(self, SYS_RES_MEMORY, CBBR_SOCKBASE,