Now that we've agreed on the name "intr_depth", let's agree on the type, too.

This commit is contained in:
thorpej 2024-01-19 20:55:42 +00:00
parent a34711bbb2
commit a7c95ef528
6 changed files with 16 additions and 16 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.32 2024/01/19 18:18:53 thorpej Exp $ */
/* $NetBSD: intr.c,v 1.33 2024/01/19 20:55:42 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.32 2024/01/19 18:18:53 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.33 2024/01/19 20:55:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.32 2024/01/19 18:18:53 thorpej Exp $");
typedef LIST_HEAD(, intrhand) ih_list_t;
static ih_list_t autovec_list[AVEC_MAX - AVEC_MIN + 1];
static ih_list_t uservec_list[UVEC_MAX - UVEC_MIN + 1];
int intr_depth;
volatile unsigned int intr_depth;
volatile int ssir;
void

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.24 2024/01/19 18:18:53 thorpej Exp $ */
/* $NetBSD: intr.h,v 1.25 2024/01/19 20:55:42 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 2007 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@ typedef struct {
int spl0(void);
extern const uint16_t ipl2psl_table[NIPL];
extern int intr_depth;
extern volatile unsigned int intr_depth;
typedef int ipl_t;

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.7 2024/01/19 18:18:54 thorpej Exp $ */
/* $NetBSD: intr.h,v 1.8 2024/01/19 20:55:42 thorpej Exp $ */
/*-
* Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
@ -70,7 +70,7 @@ typedef struct {
#ifndef _LOCORE
extern volatile int intr_depth; /* interrupt depth */
extern volatile unsigned int intr_depth;/* interrupt depth */
extern const uint16_t ipl2psl_table[NIPL];
typedef int ipl_t; /* logical IPL_* value */

View File

@ -1,4 +1,4 @@
/* $NetBSD: m68k_intr.c,v 1.12 2024/01/19 18:18:54 thorpej Exp $ */
/* $NetBSD: m68k_intr.c,v 1.13 2024/01/19 20:55:42 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.12 2024/01/19 18:18:54 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.13 2024/01/19 20:55:42 thorpej Exp $");
#define _M68K_INTR_PRIVATE
@ -70,7 +70,7 @@ extern char intrstub_vectored[];
/* A dummy event counter where interrupt stats go to die. */
static struct evcnt bitbucket;
volatile int intr_depth; /* updated in assembly glue */
volatile unsigned int intr_depth; /* updated in assembly glue */
static struct m68k_intrhand_list m68k_intrhands_autovec[NAUTOVECTORS];
#ifdef __HAVE_M68K_INTR_VECTORED

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.34 2024/01/19 18:18:54 thorpej Exp $ */
/* $NetBSD: intr.c,v 1.35 2024/01/19 20:55:42 thorpej 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.34 2024/01/19 18:18:54 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.35 2024/01/19 20:55:42 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -81,7 +81,7 @@ int intr_debug = 0;
* to interrupt on different levels as listed in locore.s
*/
uint16_t ipl2psl_table[NIPL];
int intr_depth;
volatile unsigned int intr_depth;
volatile int ssir;
extern u_int intrcnt[]; /* from locore.s */

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.212 2024/01/19 18:18:56 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.213 2024/01/19 20:55:42 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.212 2024/01/19 18:18:56 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.213 2024/01/19 20:55:42 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -1239,7 +1239,7 @@ setmemrange(void)
#endif
}
int intr_depth;
volatile unsigned int intr_depth;
bool
cpu_intr_p(void)