[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by j...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/696951117e40
branches:  netbsd-9
changeset: 963692:696951117e40
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 08 14:44:06 2020 +0000

description:
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:

 sys/dev/pci/if_ena.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 4d51b710268c -r 696951117e40 sys/dev/pci/if_ena.c
--- a/sys/dev/pci/if_ena.c      Sun Mar 08 11:22:49 2020 +0000
+++ b/sys/dev/pci/if_ena.c      Sun Mar 08 14:44:06 2020 +0000
@@ -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 @@
        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;