svn commit: r217072 - in head/sys: arm/s3c2xx0 dev/usb/controller
i386/xen mips/mips mips/rmi mips/rmi/dev/nlge
mips/rmi/dev/xlr powerpc/powerpc
John Baldwin
jhb at FreeBSD.org
Thu Jan 6 21:08:06 UTC 2011
Author: jhb
Date: Thu Jan 6 21:08:06 2011
New Revision: 217072
URL: http://svn.freebsd.org/changeset/base/217072
Log:
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.
Modified:
head/sys/arm/s3c2xx0/s3c24x0_clk.c
head/sys/dev/usb/controller/ehci_mv.c
head/sys/i386/xen/clock.c
head/sys/i386/xen/mp_machdep.c
head/sys/mips/mips/mp_machdep.c
head/sys/mips/rmi/dev/nlge/if_nlge.c
head/sys/mips/rmi/dev/xlr/rge.c
head/sys/mips/rmi/fmn.c
head/sys/powerpc/powerpc/intr_machdep.c
Modified: head/sys/arm/s3c2xx0/s3c24x0_clk.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_clk.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/arm/s3c2xx0/s3c24x0_clk.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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");
Modified: head/sys/dev/usb/controller/ehci_mv.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_mv.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/dev/usb/controller/ehci_mv.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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);
Modified: head/sys/i386/xen/clock.c
==============================================================================
--- head/sys/i386/xen/clock.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/i386/xen/clock.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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");
Modified: head/sys/i386/xen/mp_machdep.c
==============================================================================
--- head/sys/i386/xen/mp_machdep.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/i386/xen/mp_machdep.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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;
Modified: head/sys/mips/mips/mp_machdep.c
==============================================================================
--- head/sys/mips/mips/mp_machdep.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/mips/mips/mp_machdep.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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);
Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==============================================================================
--- head/sys/mips/rmi/dev/nlge/if_nlge.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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",
Modified: head/sys/mips/rmi/dev/xlr/rge.c
==============================================================================
--- head/sys/mips/rmi/dev/xlr/rge.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/mips/rmi/dev/xlr/rge.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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) {
Modified: head/sys/mips/rmi/fmn.c
==============================================================================
--- head/sys/mips/rmi/fmn.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/mips/rmi/fmn.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -437,7 +437,7 @@ register_msgring_handler(int startb, int
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);
}
Modified: head/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/intr_machdep.c Thu Jan 6 21:07:51 2011 (r217071)
+++ head/sys/powerpc/powerpc/intr_machdep.c Thu Jan 6 21:08:06 2011 (r217072)
@@ -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);
More information about the svn-src-head
mailing list