Remove bogus usage of INTR_FAST. "Fast" interrupts are now indicated by

registering a filter handler rather than a threaded handler.  Also remove
a bogus use of INTR_MPSAFE for a filter.

9 files changed, 12 insertions, 12 deletions

diff --git a/sys/arm/s3c2xx0/s3c24x0_clk.c b/sys/arm/s3c2xx0/s3c24x0_clk.c
index 33b7ae2..35ce349 100644
--- a/sys/arm/s3c2xx0/s3c24x0_clk.c
+++ b/sys/arm/s3c2xx0/s3c24x0_clk.c
@@ -200,7 +200,7 @@ cpu_initclocks(void)
 	if (!irq)
 		panic("Unable to allocate the clock irq handler.\n");
 
-	err = bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST,
+	err = bus_setup_intr(dev, irq, INTR_TYPE_CLK,
 	    clock_intr, NULL, NULL, &ihl);
 	if (err != 0)
 		panic("Unable to setup the clock irq handler.\n");
diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c
index b22303f..c51865c 100644
--- a/sys/dev/usb/controller/ehci_mv.c
+++ b/sys/dev/usb/controller/ehci_mv.c
@@ -225,7 +225,7 @@ mv_ehci_attach(device_t self)
 
 	sprintf(sc->sc_vendor, "Marvell");
 
-	err = bus_setup_intr(self, irq_err, INTR_FAST | INTR_TYPE_BIO,
+	err = bus_setup_intr(self, irq_err, INTR_TYPE_BIO,
 	    err_intr, NULL, sc, &ih_err);
 	if (err) {
 		device_printf(self, "Could not setup error irq, %d\n", err);
diff --git a/sys/i386/xen/clock.c b/sys/i386/xen/clock.c
index 03f2517..091c8c7 100644
--- a/sys/i386/xen/clock.c
+++ b/sys/i386/xen/clock.c
@@ -777,7 +777,7 @@ cpu_initclocks(void)
 	
         error = bind_virq_to_irqhandler(VIRQ_TIMER, 0, "clk", 
 	    clkintr, NULL, NULL,
-	    INTR_TYPE_CLK | INTR_FAST, &time_irq);
+	    INTR_TYPE_CLK, &time_irq);
 	if (error)
 		panic("failed to register clock interrupt\n");
 	/* should fast clock be enabled ? */
@@ -796,7 +796,7 @@ ap_cpu_initclocks(int cpu)
 			   &xen_set_periodic_tick);
         error = bind_virq_to_irqhandler(VIRQ_TIMER, 0, "clk", 
 	    clkintr, NULL, NULL,
-	    INTR_TYPE_CLK | INTR_FAST, &time_irq);
+	    INTR_TYPE_CLK, &time_irq);
 	if (error)
 		panic("failed to register clock interrupt\n");
 
diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c
index 8edbb7f..6e0fa23 100644
--- a/sys/i386/xen/mp_machdep.c
+++ b/sys/i386/xen/mp_machdep.c
@@ -470,7 +470,7 @@ xen_smp_intr_init(unsigned int cpu)
 				    cpu,
 				    resched_name[cpu],
 				    smp_reschedule_interrupt,
-	    INTR_FAST|INTR_TYPE_TTY|INTR_MPSAFE, &irq);
+	    INTR_TYPE_TTY, &irq);
 
 	printf("[XEN] IPI cpu=%d irq=%d vector=RESCHEDULE_VECTOR (%d)\n",
 	    cpu, irq, RESCHEDULE_VECTOR);
@@ -482,7 +482,7 @@ xen_smp_intr_init(unsigned int cpu)
 				    cpu,
 				    callfunc_name[cpu],
 				    smp_call_function_interrupt,
-	    INTR_FAST|INTR_TYPE_TTY|INTR_MPSAFE, &irq);
+	    INTR_TYPE_TTY, &irq);
 	if (rc < 0)
 		goto fail;
 	per_cpu(callfunc_irq, cpu) = irq;
diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c
index 41de5fb..1203573 100644
--- a/sys/mips/mips/mp_machdep.c
+++ b/sys/mips/mips/mp_machdep.c
@@ -333,7 +333,7 @@ release_aps(void *dummy __unused)
 	 */
 	ipi_irq = platform_ipi_intrnum();
 	cpu_establish_hardintr("ipi", mips_ipi_handler, NULL, NULL, ipi_irq,
-			       INTR_TYPE_MISC | INTR_EXCL | INTR_FAST, NULL);
+			       INTR_TYPE_MISC | INTR_EXCL, NULL);
 
 	atomic_store_rel_int(&aps_ready, 1);
 
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 5c3dd2f..7b8845f 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -1715,8 +1715,8 @@ nlge_irq_init(struct nlge_softc *sc)
 
 	irq_num = block_info->baseirq + sc->instance;
 	irq_res.__r_i = (struct resource_i *)(intptr_t) (irq_num);
-	ret = bus_setup_intr(sc->nlge_dev, &irq_res, (INTR_FAST |
-	    INTR_TYPE_NET | INTR_MPSAFE), NULL, nlge_intr, sc, NULL);
+	ret = bus_setup_intr(sc->nlge_dev, &irq_res,
+	    INTR_TYPE_NET | INTR_MPSAFE, NULL, nlge_intr, sc, NULL);
 	if (ret) {
 		nlge_detach(sc->nlge_dev);
 		device_printf(sc->nlge_dev, "couldn't set up irq: error=%d\n",
diff --git a/sys/mips/rmi/dev/xlr/rge.c b/sys/mips/rmi/dev/xlr/rge.c
index 913084f..274a934 100644
--- a/sys/mips/rmi/dev/xlr/rge.c
+++ b/sys/mips/rmi/dev/xlr/rge.c
@@ -1841,7 +1841,7 @@ rge_attach(device_t dev)
 	 */
 	sc->rge_irq.__r_i = (struct resource_i *)(intptr_t)sc->irq;
 
-	ret = bus_setup_intr(dev, &sc->rge_irq, INTR_FAST | INTR_TYPE_NET | INTR_MPSAFE,
+	ret = bus_setup_intr(dev, &sc->rge_irq, INTR_TYPE_NET | INTR_MPSAFE,
 	    NULL, rge_intr, sc, &sc->rge_intrhand);
 
 	if (ret) {
diff --git a/sys/mips/rmi/fmn.c b/sys/mips/rmi/fmn.c
index 011d7a1..f42dfea 100644
--- a/sys/mips/rmi/fmn.c
+++ b/sys/mips/rmi/fmn.c
@@ -437,7 +437,7 @@ register_msgring_handler(int startb, int endb, msgring_handler action,
 			msgring_maxthreads = xlr_threads_per_core;
 		cpu_establish_hardintr("msgring", msgring_process_fast_intr,
 			NULL, NULL, IRQ_MSGRING, 
-			INTR_TYPE_NET | INTR_FAST, &cookie);
+			INTR_TYPE_NET, &cookie);
 	}
 	return (0);
 }
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 4b2dbbe..a33bddb 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -352,7 +352,7 @@ powerpc_enable_intr(void)
 		error = powerpc_setup_intr("IPI",
 		    INTR_VEC(piclist[n].pic_id, piclist[n].ipi_irq),
 		    powerpc_ipi_handler, NULL, NULL,
-		    INTR_TYPE_MISC | INTR_EXCL | INTR_FAST, &ipi_cookie);
+		    INTR_TYPE_MISC | INTR_EXCL, &ipi_cookie);
 		if (error) {
 			printf("unable to setup IPI handler\n");
 			return (error);