summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-03-08 14:44:06 +0000
committermartin <martin@NetBSD.org>2020-03-08 14:44:06 +0000
commita51f6ef85d2b48d1f0ca0f3c8e19131c9fdf4c68 (patch)
tree4b62aaf9119222a6fe238e18fb4129bf6904c6da /sys/dev
parent64e793c6d1a4052a371ace0b43ed72d400189a4a (diff)
Pull up following revision(s) (requested by jdolecek in ticket #759):
sys/dev/pci/if_ena.c: revision 1.24 replace #if condition for irq_slot with __diagused on the cleanup path fixes PR kern/55044 by Uwe Toenjes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_ena.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_ena.c b/sys/dev/pci/if_ena.c
index 7228136ea1c..9a02292a7a3 100644
--- a/sys/dev/pci/if_ena.c
+++ b/sys/dev/pci/if_ena.c
@@ -31,7 +31,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.1 2019/08/09 16:06:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.15.2.2 2020/03/08 14:44:06 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2085,9 +2085,7 @@ err:
kcpuset_destroy(affinity);
for (i--; i >= 0; i--) {
-#if defined(DEBUG) || defined(DIAGNOSTIC)
- int irq_slot = i + irq_off;
-#endif
+ int irq_slot __diagused = i + irq_off;
KASSERT(adapter->sc_ihs[irq_slot] != NULL);
pci_intr_disestablish(adapter->sc_pa.pa_pc, adapter->sc_ihs[i]);
adapter->sc_ihs[i] = NULL;