diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index 366a27b30be8..b4c5b8d0e3ea 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -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);
 }
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index 2ba6b0e78903..80155932deeb 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -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);
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index 5098af3abbbb..37819fac2e9e 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -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;
diff --git a/sys/mips/atheros/ar531x/apb.c b/sys/mips/atheros/ar531x/apb.c
index cbf6776c6408..6e224a5e9305 100644
--- a/sys/mips/atheros/ar531x/apb.c
+++ b/sys/mips/atheros/ar531x/apb.c
@@ -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);
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index 88e0f60093a8..9ff605acb971 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -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);
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 2cd37a462815..ebb40142ccb3 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -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);
 		}
diff --git a/sys/mips/atheros/qca955x_pci.c b/sys/mips/atheros/qca955x_pci.c
index e736942b0e84..48edec9cc5c2 100644
--- a/sys/mips/atheros/qca955x_pci.c
+++ b/sys/mips/atheros/qca955x_pci.c
@@ -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);
 		}
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index a164be4941e2..a294661943b8 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -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? */
diff --git a/sys/mips/mediatek/mtk_pcie.c b/sys/mips/mediatek/mtk_pcie.c
index 635fa78d87b1..6d3aa3e2550c 100644
--- a/sys/mips/mediatek/mtk_pcie.c
+++ b/sys/mips/mediatek/mtk_pcie.c
@@ -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;
diff --git a/sys/mips/mips/intr_machdep.c b/sys/mips/mips/intr_machdep.c
index c4c666196071..3b278276865c 100644
--- a/sys/mips/mips/intr_machdep.c
+++ b/sys/mips/mips/intr_machdep.c
@@ -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;
diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c
index a3efdc3b6bd0..45196331af37 100644
--- a/sys/sparc64/sparc64/intr_machdep.c
+++ b/sys/sparc64/sparc64/intr_machdep.c
@@ -375,7 +375,7 @@ inthand_add(const char *name, int vec, driver_filter_t *filt,
 		 * 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;