[src/trunk]: src/sys/arch For ports with __HAVE_LEGACY_INTRCNT, turn intrcnt[...

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

details:   https://anonhg.NetBSD.org/src/rev/ffe2f427268f
branches:  trunk
changeset: 960912:ffe2f427268f
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Apr 02 12:11:41 2021 +0000

description:
For ports with __HAVE_LEGACY_INTRCNT, turn intrcnt[] and derived
variables into u_int, to match with kern/subr_evcnt.c.

diffstat:

 sys/arch/atari/include/intr.h  |  8 ++++----
 sys/arch/cesfic/cesfic/isr.c   |  6 +++---
 sys/arch/luna68k/luna68k/isr.c |  6 +++---
 sys/arch/mac68k/mac68k/intr.c  |  6 +++---
 sys/arch/mvme68k/mvme68k/isr.c |  6 +++---
 sys/arch/next68k/next68k/isr.c |  6 +++---
 sys/arch/sun3/sun3/clock.c     |  6 +++---
 sys/arch/sun3/sun3x/clock.c    |  6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diffs (219 lines):

diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/atari/include/intr.h
--- a/sys/arch/atari/include/intr.h     Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/atari/include/intr.h     Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.21 2009/07/08 12:23:10 tsutsui Exp $        */
+/*     $NetBSD: intr.h,v 1.22 2021/04/02 12:11:41 rin Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 2007 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@
        int                     ih_type;
        int                     ih_pri;
        int                     ih_vector;
-       u_long                  *ih_intrcnt;
+       u_int                   *ih_intrcnt;
 };
 
 void           intr_init(void);
@@ -127,9 +127,9 @@
  * Exported by intrcnt.h
  */
 extern u_long  autovects[];
-extern u_long  intrcnt_auto[];
+extern u_int   intrcnt_auto[];
 extern u_long  uservects[];
-extern u_long  intrcnt_user[];
+extern u_int   intrcnt_user[];
 
 #endif /* _KERNEL */
 
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/cesfic/cesfic/isr.c
--- a/sys/arch/cesfic/cesfic/isr.c      Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/cesfic/cesfic/isr.c      Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $ */
+/*     $NetBSD: isr.c,v 1.19 2021/04/02 12:11:41 rin Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.19 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,7 +50,7 @@
 typedef LIST_HEAD(, isr) isr_list_t;
 isr_list_t isr_list[NISR];
 
-extern int intrcnt[];          /* from locore.s */
+extern u_int intrcnt[];        /* from locore.s */
 
 void
 isrinit(void)
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/luna68k/luna68k/isr.c
--- a/sys/arch/luna68k/luna68k/isr.c    Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/luna68k/luna68k/isr.c    Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isr.c,v 1.24 2020/12/19 21:38:30 thorpej Exp $ */
+/*     $NetBSD: isr.c,v 1.25 2021/04/02 12:11:41 rin Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.24 2020/12/19 21:38:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.25 2021/04/02 12:11:41 rin Exp $");
 
 /*
  * Link and dispatch interrupts.
@@ -51,7 +51,7 @@
 struct isr_vectored isr_vectored[NISRVECTORED];
 int    idepth;
 
-extern int intrcnt[];          /* from locore.s */
+extern u_int intrcnt[];        /* from locore.s */
 extern void (*vectab[])(void);
 extern void badtrap(void);
 extern void intrhand_vectored(void);
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/mac68k/mac68k/intr.c
--- a/sys/arch/mac68k/mac68k/intr.c     Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/mac68k/mac68k/intr.c     Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.31 2020/07/21 06:10:26 rin Exp $    */
+/*     $NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.31 2020/07/21 06:10:26 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,7 +85,7 @@
 int idepth;
 volatile int ssir;
 
-extern int intrcnt[];          /* from locore.s */
+extern u_int intrcnt[];        /* from locore.s */
 
 void   intr_computeipl(void);
 
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/mvme68k/mvme68k/isr.c
--- a/sys/arch/mvme68k/mvme68k/isr.c    Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/mvme68k/mvme68k/isr.c    Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $ */
+/*     $NetBSD: isr.c,v 1.36 2021/04/02 12:11:41 rin Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.36 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,7 +63,7 @@
 };
 static int idepth;
 
-extern int intrcnt[];          /* from locore.s. XXXSCW: will go away soon */
+extern u_int intrcnt[];        /* from locore.s. XXXSCW: will go away soon */
 extern void (*vectab[])(void);
 extern void badtrap(void);
 extern void intrhand_vectored(void);
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/next68k/next68k/isr.c
--- a/sys/arch/next68k/next68k/isr.c    Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/next68k/next68k/isr.c    Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $ */
+/*     $NetBSD: isr.c,v 1.32 2021/04/02 12:11:41 rin Exp $ */
 
 /*
  * This file was taken from mvme68k/mvme68k/isr.c
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.32 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,7 @@
 
 int idepth;
 int ssir;
-extern int intrcnt[];          /* from locore.s. XXXSCW: will go away soon */
+extern u_int intrcnt[];        /* from locore.s. XXXSCW: will go away soon */
 extern void (*vectab[])(void);
 extern void badtrap(void);
 extern void intrhand_vectored(void);
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/sun3/sun3/clock.c
--- a/sys/arch/sun3/sun3/clock.c        Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/sun3/sun3/clock.c        Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $       */
+/*     $NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $   */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,7 +108,7 @@
 #include <dev/ic/intersil7170reg.h>
 #include <dev/ic/intersil7170var.h>
 
-extern int intrcnt[];
+extern u_int intrcnt[];
 
 #define        CLOCK_PRI       5
 #define IREG_CLK_BITS  (IREG_CLOCK_ENAB_7 | IREG_CLOCK_ENAB_5)
diff -r 8ee7a49c0c1f -r ffe2f427268f sys/arch/sun3/sun3x/clock.c
--- a/sys/arch/sun3/sun3x/clock.c       Fri Apr 02 11:53:25 2021 +0000
+++ b/sys/arch/sun3/sun3x/clock.c       Fri Apr 02 12:11:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $       */
+/*     $NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $   */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -122,7 +122,7 @@
 #include <sun3/sun3/machdep.h>
 #include <sun3/sun3/interreg.h>
 
-extern int intrcnt[];
+extern u_int intrcnt[];
 
 #define SUN3_470       Yes