Module Name: src
Committed By: chs
Date: Tue Aug 14 15:46:21 UTC 2012
Modified Files:
src/sys/arch/evbarm/iq80310: iq80310_intr.c
Log Message:
move evcnt_attach_dynamic() calls later to avoid assertions.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/iq80310/iq80310_intr.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/arch/evbarm/iq80310/iq80310_intr.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.30 src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.31
--- src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.30 Thu Aug 2 15:56:07 2012
+++ src/sys/arch/evbarm/iq80310/iq80310_intr.c Tue Aug 14 15:46:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.30 2012/08/02 15:56:07 skrll Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.31 2012/08/14 15:46:21 chs Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.30 2012/08/02 15:56:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.31 2012/08/14 15:46:21 chs Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -338,8 +338,6 @@ iq80310_intr_init(void)
TAILQ_INIT(&iq->iq_list);
sprintf(iq->iq_name, "irq %d", i);
- evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
- NULL, "iq80310", iq->iq_name);
}
iq80310_intr_calculate_masks();
@@ -379,6 +377,8 @@ iq80310_intr_establish(int irq, int ipl,
oldirqstate = disable_interrupts(I32_bit);
TAILQ_INSERT_TAIL(&iq->iq_list, ih, ih_list);
+ evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
+ NULL, "iq80310", iq->iq_name);
iq80310_intr_calculate_masks();
