Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci replace #if condition for irq_slot with __diagus...
details: https://anonhg.NetBSD.org/src/rev/010e4139d6f4
branches: trunk
changeset: 745512:010e4139d6f4
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Tue Mar 03 21:42:31 2020 +0000
description:
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 114ed2fe6ea4 -r 010e4139d6f4 sys/dev/pci/if_ena.c
--- a/sys/dev/pci/if_ena.c Tue Mar 03 20:01:01 2020 +0000
+++ b/sys/dev/pci/if_ena.c Tue Mar 03 21:42:31 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.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 @@
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;
Home |
Main Index |
Thread Index |
Old Index