For ports with __HAVE_LEGACY_INTRCNT, turn intrcnt[] and derived
variables into u_int, to match with kern/subr_evcnt.c.
This commit is contained in:
rin
parent
a9672b5f66
commit
6c56221482
@ -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 @@ struct intrhand {
|
||||
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 @@ void intr_glue(void);
|
||||
* 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 */
|
||||
|
||||
|
||||
@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $");
|
||||
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)
|
||||
|
||||
@ -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 @@ isr_autovec_list_t isr_autovec[NISRAUTOVEC];
|
||||
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);
|
||||
|
||||
@ -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 @@ uint16_t ipl2psl_table[NIPL];
|
||||
int idepth;
|
||||
volatile int ssir;
|
||||
|
||||
extern int intrcnt[]; /* from locore.s */
|
||||
extern u_int intrcnt[]; /* from locore.s */
|
||||
|
||||
void intr_computeipl(void);
|
||||
|
||||
|
||||
@ -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 @@ struct evcnt mvme68k_irq_evcnt[] = {
|
||||
};
|
||||
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);
|
||||
|
||||
@ -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 @@ struct evcnt next68k_irq_evcnt[] = {
|
||||
|
||||
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);
|
||||
|
||||
@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $");
|
||||
#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)
|
||||
|
||||
@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $");
|
||||
#include <sun3/sun3/machdep.h>
|
||||
#include <sun3/sun3/interreg.h>
|
||||
|
||||
extern int intrcnt[];
|
||||
extern u_int intrcnt[];
|
||||
|
||||
#define SUN3_470 Yes
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user