Module Name: src
Committed By: thorpej
Date: Fri Jan 19 20:55:42 UTC 2024
Modified Files:
src/sys/arch/atari/atari: intr.c
src/sys/arch/atari/include: intr.h
src/sys/arch/m68k/include: intr.h
src/sys/arch/m68k/m68k: m68k_intr.c
src/sys/arch/mac68k/mac68k: intr.c
src/sys/arch/x68k/x68k: machdep.c
Log Message:
Now that we've agreed on the name "intr_depth", let's agree on the type, too.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/atari/atari/intr.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/atari/include/intr.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/include/intr.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/m68k/m68k/m68k_intr.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/mac68k/mac68k/intr.c
cvs rdiff -u -r1.212 -r1.213 src/sys/arch/x68k/x68k/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/intr.c
diff -u src/sys/arch/atari/atari/intr.c:1.32 src/sys/arch/atari/atari/intr.c:1.33
--- src/sys/arch/atari/atari/intr.c:1.32 Fri Jan 19 18:18:53 2024
+++ src/sys/arch/atari/atari/intr.c Fri Jan 19 20:55:42 2024
@@ -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.3
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
Index: src/sys/arch/atari/include/intr.h
diff -u src/sys/arch/atari/include/intr.h:1.24 src/sys/arch/atari/include/intr.h:1.25
--- src/sys/arch/atari/include/intr.h:1.24 Fri Jan 19 18:18:53 2024
+++ src/sys/arch/atari/include/intr.h Fri Jan 19 20:55:42 2024
@@ -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;
Index: src/sys/arch/m68k/include/intr.h
diff -u src/sys/arch/m68k/include/intr.h:1.7 src/sys/arch/m68k/include/intr.h:1.8
--- src/sys/arch/m68k/include/intr.h:1.7 Fri Jan 19 18:18:54 2024
+++ src/sys/arch/m68k/include/intr.h Fri Jan 19 20:55:42 2024
@@ -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 */
Index: src/sys/arch/m68k/m68k/m68k_intr.c
diff -u src/sys/arch/m68k/m68k/m68k_intr.c:1.12 src/sys/arch/m68k/m68k/m68k_intr.c:1.13
--- src/sys/arch/m68k/m68k/m68k_intr.c:1.12 Fri Jan 19 18:18:54 2024
+++ src/sys/arch/m68k/m68k/m68k_intr.c Fri Jan 19 20:55:42 2024
@@ -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
Index: src/sys/arch/mac68k/mac68k/intr.c
diff -u src/sys/arch/mac68k/mac68k/intr.c:1.34 src/sys/arch/mac68k/mac68k/intr.c:1.35
--- src/sys/arch/mac68k/mac68k/intr.c:1.34 Fri Jan 19 18:18:54 2024
+++ src/sys/arch/mac68k/mac68k/intr.c Fri Jan 19 20:55:42 2024
@@ -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 */
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.212 src/sys/arch/x68k/x68k/machdep.c:1.213
--- src/sys/arch/x68k/x68k/machdep.c:1.212 Fri Jan 19 18:18:56 2024
+++ src/sys/arch/x68k/x68k/machdep.c Fri Jan 19 20:55:42 2024
@@ -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)
