Author: avg
Date: Mon Jul 23 15:36:55 2018
New Revision: 336639
URL: https://svnweb.freebsd.org/changeset/base/336639
Log:
follow-up to r336635, update TAILQ to CK_SLIST for ie_handlers
arm, mips and sparc64 were affected.
Modified:
head/sys/arm/arm/intr.c
head/sys/arm/mv/gpio.c
head/sys/mips/atheros/apb.c
head/sys/mips/atheros/ar531x/apb.c
head/sys/mips/atheros/ar71xx_pci.c
head/sys/mips/atheros/ar724x_pci.c
head/sys/mips/atheros/qca955x_pci.c
head/sys/mips/malta/gt_pci.c
head/sys/mips/mediatek/mtk_pcie.c
head/sys/mips/mips/intr_machdep.c
head/sys/sparc64/sparc64/intr_machdep.c
Modified: head/sys/arm/arm/intr.c
==============================================================================
--- head/sys/arm/arm/intr.c Mon Jul 23 14:58:44 2018 (r336638)
+++ head/sys/arm/arm/intr.c Mon Jul 23 15:36:55 2018 (r336639)
@@ -170,7 +170,7 @@ arm_remove_irqhandler(int irq, void *cookie)
error = intr_event_remove_handler(cookie);
- if (!TAILQ_EMPTY(&event->ie_handlers))
+ if (!CK_SLIST_EMPTY(&event->ie_handlers))
arm_unmask_irq(irq);
return (error);
}
Modified: head/sys/arm/mv/gpio.c
==============================================================================
--- head/sys/arm/mv/gpio.c Mon Jul 23 14:58:44 2018 (r336638)
+++ head/sys/arm/mv/gpio.c Mon Jul 23 15:36:55 2018 (r336639)
@@ -515,7 +515,8 @@ mv_gpio_intr_handler(device_t dev, int pin)
#endif
isrc.isrc_event = sc->gpio_events[pin];
- if (isrc.isrc_event == NULL ||
TAILQ_EMPTY(&isrc.isrc_event->ie_handlers))
+ if (isrc.isrc_event == NULL ||
+ CK_SLIST_EMPTY(&isrc.isrc_event->ie_handlers))
return;
intr_isrc_dispatch(&isrc, NULL);
Modified: head/sys/mips/atheros/apb.c
==============================================================================
--- head/sys/mips/atheros/apb.c Mon Jul 23 14:58:44 2018 (r336638)
+++ head/sys/mips/atheros/apb.c Mon Jul 23 15:36:55 2018 (r336639)
@@ -382,7 +382,7 @@ apb_filter(void *arg)
event = sc->sc_eventstab[irq];
/* always count interrupts; spurious or otherwise */
mips_intrcnt_inc(sc->sc_intr_counter[irq]);
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
if (irq == APB_INTR_PMC) {
td = PCPU_GET(curthread);
tf = td->td_intr_frame;
Modified: head/sys/mips/atheros/ar531x/apb.c
==============================================================================
--- head/sys/mips/atheros/ar531x/apb.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/atheros/ar531x/apb.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -508,7 +508,7 @@ apb_filter(void *arg)
}
event = sc->sc_eventstab[irq];
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
if(irq == 1 && ar531x_soc < AR531X_SOC_AR5315) {
ATH_READ_REG(AR5312_SYSREG_BASE +
AR5312_SYSREG_AHBPERR);
Modified: head/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_pci.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/atheros/ar71xx_pci.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -630,7 +630,7 @@ ar71xx_pci_intr(void *arg)
for (irq = AR71XX_PCI_IRQ_START; irq <= AR71XX_PCI_IRQ_END; irq++) {
if (reg & (1 << irq)) {
event = sc->sc_eventstab[irq];
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
/* Ignore timer interrupts */
if (irq != 0)
printf("Stray IRQ %d\n", irq);
Modified: head/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- head/sys/mips/atheros/ar724x_pci.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/atheros/ar724x_pci.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -605,7 +605,7 @@ ar724x_pci_intr(void *arg)
irq = AR71XX_PCI_IRQ_START;
event = sc->sc_eventstab[irq];
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
printf("Stray IRQ %d\n", irq);
return (FILTER_STRAY);
}
Modified: head/sys/mips/atheros/qca955x_pci.c
==============================================================================
--- head/sys/mips/atheros/qca955x_pci.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/atheros/qca955x_pci.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -539,7 +539,7 @@ qca955x_pci_intr(void *arg)
if (reg & QCA955X_PCI_INTR_DEV0) {
irq = AR71XX_PCI_IRQ_START;
event = sc->sc_eventstab[irq];
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
printf("Stray IRQ %d\n", irq);
return (FILTER_STRAY);
}
Modified: head/sys/mips/malta/gt_pci.c
==============================================================================
--- head/sys/mips/malta/gt_pci.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/malta/gt_pci.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -231,7 +231,7 @@ gt_pci_intr(void *v)
event = sc->sc_eventstab[irq];
- if (!event || TAILQ_EMPTY(&event->ie_handlers))
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers))
continue;
/* TODO: frame instead of NULL? */
Modified: head/sys/mips/mediatek/mtk_pcie.c
==============================================================================
--- head/sys/mips/mediatek/mtk_pcie.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/mediatek/mtk_pcie.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -762,7 +762,7 @@ mtk_pci_intr(void *arg)
if (reg & (1u<<irq)) {
irqidx = irq - sc->sc_irq_start;
event = sc->sc_eventstab[irqidx];
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
if (irq != 0)
printf("Stray PCI IRQ %d\n", irq);
continue;
Modified: head/sys/mips/mips/intr_machdep.c
==============================================================================
--- head/sys/mips/mips/intr_machdep.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/mips/mips/intr_machdep.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -257,7 +257,7 @@ cpu_intr(struct trapframe *tf)
break;
}
- if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ if (!event || CK_SLIST_EMPTY(&event->ie_handlers)) {
printf("stray %s interrupt %d\n",
hard ? "hard" : "soft", i);
continue;
Modified: head/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/intr_machdep.c Mon Jul 23 14:58:44 2018
(r336638)
+++ head/sys/sparc64/sparc64/intr_machdep.c Mon Jul 23 15:36:55 2018
(r336639)
@@ -375,7 +375,7 @@ inthand_add(const char *name, int vec, driver_filter_t
* pretty rare in practice.
*/
filter = 0;
- TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
+ CK_SLIST_FOREACH(ih, &ie->ie_handlers, ih_next) {
if (ih->ih_filter != NULL && ih->ih_filter != filt) {
filter = 1;
break;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
