[src/netbsd-6]: src/sys/arch/evbarm/iq80310 Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/41804147c8af
branches:  netbsd-6
changeset: 774481:41804147c8af
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Aug 20 19:39:27 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #509):
        sys/arch/evbarm/iq80310/iq80310_intr.c: revision 1.31
move evcnt_attach_dynamic() calls later to avoid assertions.

diffstat:

 sys/arch/evbarm/iq80310/iq80310_intr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 93c3296175dd -r 41804147c8af sys/arch/evbarm/iq80310/iq80310_intr.c
--- a/sys/arch/evbarm/iq80310/iq80310_intr.c    Mon Aug 20 19:36:57 2012 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_intr.c    Mon Aug 20 19:39:27 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $ */
+/*     $NetBSD: iq80310_intr.c,v 1.29.8.1 2012/08/20 19:39:27 riz 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.29 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29.8.1 2012/08/20 19:39:27 riz Exp $");
 
 #ifndef EVBARM_SPL_NOINLINE
 #define        EVBARM_SPL_NOINLINE
@@ -338,8 +338,6 @@
                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 @@
        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();