Module Name: src
Committed By: jdolecek
Date: Tue Mar 3 21:42:31 UTC 2020
Modified Files:
src/sys/dev/pci: if_ena.c
Log Message:
replace #if condition for irq_slot with __diagused on the cleanup path
fixes PR kern/55044 by Uwe Toenjes
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/if_ena.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ena.c
diff -u src/sys/dev/pci/if_ena.c:1.23 src/sys/dev/pci/if_ena.c:1.24
--- src/sys/dev/pci/if_ena.c:1.23 Mon Feb 24 12:20:30 2020
+++ src/sys/dev/pci/if_ena.c Tue Mar 3 21:42:31 2020
@@ -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.23 2020/02/24 12:20:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.24 2020/03/03 21:42:31 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2079,9 +2079,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;
