Fri Apr 2 12:11:42 2021 UTC ()
For ports with __HAVE_LEGACY_INTRCNT, turn intrcnt[] and derived
variables into u_int, to match with kern/subr_evcnt.c.
(rin)
diff -r1.21 -r1.22 src/sys/arch/atari/include/intr.h
diff -r1.18 -r1.19 src/sys/arch/cesfic/cesfic/isr.c
diff -r1.24 -r1.25 src/sys/arch/luna68k/luna68k/isr.c
diff -r1.31 -r1.32 src/sys/arch/mac68k/mac68k/intr.c
diff -r1.35 -r1.36 src/sys/arch/mvme68k/mvme68k/isr.c
diff -r1.31 -r1.32 src/sys/arch/next68k/next68k/isr.c
diff -r1.64 -r1.65 src/sys/arch/sun3/sun3/clock.c
diff -r1.40 -r1.41 src/sys/arch/sun3/sun3x/clock.c
--- src/sys/arch/atari/include/intr.h 2009/07/08 12:23:10 1.21
+++ src/sys/arch/atari/include/intr.h 2021/04/02 12:11:41 1.22
@@ -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 */
--- src/sys/arch/cesfic/cesfic/isr.c 2020/11/18 03:40:50 1.18
+++ src/sys/arch/cesfic/cesfic/isr.c 2021/04/02 12:11:41 1.19
@@ -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)
--- src/sys/arch/luna68k/luna68k/isr.c 2020/12/19 21:38:30 1.24
+++ src/sys/arch/luna68k/luna68k/isr.c 2021/04/02 12:11:41 1.25
@@ -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);
--- src/sys/arch/mac68k/mac68k/intr.c 2020/07/21 06:10:26 1.31
+++ src/sys/arch/mac68k/mac68k/intr.c 2021/04/02 12:11:41 1.32
@@ -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);
--- src/sys/arch/mvme68k/mvme68k/isr.c 2020/11/21 17:59:13 1.35
+++ src/sys/arch/mvme68k/mvme68k/isr.c 2021/04/02 12:11:41 1.36
@@ -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);
--- src/sys/arch/next68k/next68k/isr.c 2020/11/21 17:49:20 1.31
+++ src/sys/arch/next68k/next68k/isr.c 2021/04/02 12:11:41 1.32
@@ -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);
--- src/sys/arch/sun3/sun3/clock.c 2013/09/07 15:56:11 1.64
+++ src/sys/arch/sun3/sun3/clock.c 2021/04/02 12:11:41 1.65
@@ -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)
--- src/sys/arch/sun3/sun3x/clock.c 2013/09/06 17:43:19 1.40
+++ src/sys/arch/sun3/sun3x/clock.c 2021/04/02 12:11:41 1.41
@@ -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