Module Name: src
Committed By: thorpej
Date: Mon Jan 15 17:40:35 UTC 2024
Modified Files:
src/sys/arch/sun2/sun2: locore.s
src/sys/arch/sun3/sun3: clock.c locore.s
src/sys/arch/sun3/sun3x: clock.c locore.s
src/sys/arch/sun68k/include: intr.h types.h
Log Message:
G/C __HAVE_LEGACY_INTRCNT from the sun68k platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sun3/sun3/clock.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sun3/sun3x/clock.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sun68k/include/intr.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun68k/include/types.h
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/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.34 src/sys/arch/sun2/sun2/locore.s:1.35
--- src/sys/arch/sun2/sun2/locore.s:1.34 Sun Jan 14 22:34:54 2024
+++ src/sys/arch/sun2/sun2/locore.s Mon Jan 15 17:40:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.34 2024/01/14 22:34:54 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.35 2024/01/15 17:40:34 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -411,25 +411,6 @@ GLOBAL(_isr_clock)
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-/* interrupt counters (needed by vmstat) */
-GLOBAL(intrnames)
- .asciz "spur" | 0
- .asciz "lev1" | 1
- .asciz "lev2" | 2
- .asciz "lev3" | 3
- .asciz "lev4" | 4
- .asciz "clock" | 5
- .asciz "lev6" | 6
- .asciz "nmi" | 7
-GLOBAL(eintrnames)
-
- .data
- .even
-GLOBAL(intrcnt)
- .long 0,0,0,0,0,0,0,0
-GLOBAL(eintrcnt)
- .text
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/sun3/sun3/clock.c
diff -u src/sys/arch/sun3/sun3/clock.c:1.66 src/sys/arch/sun3/sun3/clock.c:1.67
--- src/sys/arch/sun3/sun3/clock.c:1.66 Sun Jan 14 17:51:16 2024
+++ src/sys/arch/sun3/sun3/clock.c Mon Jan 15 17:40:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.66 2024/01/14 17:51:16 thorpej Exp $ */
+/* $NetBSD: clock.c,v 1.67 2024/01/15 17:40:35 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -83,13 +83,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.66 2024/01/14 17:51:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.67 2024/01/15 17:40:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
@@ -109,8 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include <dev/ic/intersil7170reg.h>
#include <dev/ic/intersil7170var.h>
-extern u_int intrcnt[];
-
#define CLOCK_PRI 5
#define IREG_CLK_BITS (IREG_CLOCK_ENAB_7 | IREG_CLOCK_ENAB_5)
@@ -317,7 +316,7 @@ clock_intr(struct clockframe cf)
/* Read the clock intr. reg. AGAIN! */
intersil_clear();
- intrcnt[CLOCK_PRI]++;
+ m68k_intr_evcnt[CLOCK_PRI].ev_count++;
curcpu()->ci_data.cpu_nintr++;
{ /* Entertainment! */
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.106 src/sys/arch/sun3/sun3/locore.s:1.107
--- src/sys/arch/sun3/sun3/locore.s:1.106 Sun Jan 14 22:34:54 2024
+++ src/sys/arch/sun3/sun3/locore.s Mon Jan 15 17:40:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.106 2024/01/14 22:34:54 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.107 2024/01/15 17:40:35 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -457,25 +457,6 @@ GLOBAL(_isr_clock)
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-/* interrupt counters (needed by vmstat) */
-GLOBAL(intrnames)
- .asciz "spur" | 0
- .asciz "lev1" | 1
- .asciz "lev2" | 2
- .asciz "lev3" | 3
- .asciz "lev4" | 4
- .asciz "clock" | 5
- .asciz "lev6" | 6
- .asciz "nmi" | 7
-GLOBAL(eintrnames)
-
- .data
- .even
-GLOBAL(intrcnt)
- .long 0,0,0,0,0,0,0,0
-GLOBAL(eintrcnt)
- .text
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/sun3/sun3x/clock.c
diff -u src/sys/arch/sun3/sun3x/clock.c:1.42 src/sys/arch/sun3/sun3x/clock.c:1.43
--- src/sys/arch/sun3/sun3x/clock.c:1.42 Sun Jan 14 17:51:16 2024
+++ src/sys/arch/sun3/sun3x/clock.c Mon Jan 15 17:40:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.42 2024/01/14 17:51:16 thorpej Exp $ */
+/* $NetBSD: clock.c,v 1.43 2024/01/15 17:40:35 thorpej Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2024/01/14 17:51:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.43 2024/01/15 17:40:35 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,8 +123,6 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include <sun3/sun3/machdep.h>
#include <sun3/sun3/interreg.h>
-extern u_int intrcnt[];
-
#define SUN3_470 Yes
#define CLOCK_PRI 5
@@ -443,7 +441,7 @@ clock_intr(struct clockframe cf)
}
#endif /* SUN3_470 */
- intrcnt[CLOCK_PRI]++;
+ m68k_intr_evcnt[CLOCK_PRI].ev_count++;
curcpu()->ci_data.cpu_nintr++;
/* Entertainment! */
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.74 src/sys/arch/sun3/sun3x/locore.s:1.75
--- src/sys/arch/sun3/sun3x/locore.s:1.74 Sun Jan 14 22:34:54 2024
+++ src/sys/arch/sun3/sun3x/locore.s Mon Jan 15 17:40:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.74 2024/01/14 22:34:54 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.75 2024/01/15 17:40:35 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -442,25 +442,6 @@ GLOBAL(_isr_clock)
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-/* interrupt counters (needed by vmstat) */
-GLOBAL(intrnames)
- .asciz "spur" | 0
- .asciz "lev1" | 1
- .asciz "lev2" | 2
- .asciz "lev3" | 3
- .asciz "lev4" | 4
- .asciz "clock" | 5
- .asciz "lev6" | 6
- .asciz "nmi" | 7
-GLOBAL(eintrnames)
-
- .data
- .even
-GLOBAL(intrcnt)
- .long 0,0,0,0,0,0,0,0
-GLOBAL(eintrcnt)
- .text
-
/*
* Emulation of VAX REI instruction.
*
Index: src/sys/arch/sun68k/include/intr.h
diff -u src/sys/arch/sun68k/include/intr.h:1.24 src/sys/arch/sun68k/include/intr.h:1.25
--- src/sys/arch/sun68k/include/intr.h:1.24 Sun Jan 14 22:34:54 2024
+++ src/sys/arch/sun68k/include/intr.h Mon Jan 15 17:40:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.24 2024/01/14 22:34:54 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.25 2024/01/15 17:40:35 thorpej Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -41,6 +41,9 @@
#define MACHINE_PSL_IPL_VM PSL_IPL4
#define MACHINE_PSL_IPL_SCHED PSL_IPL7
+#define MACHINE_INTREVCNT_NAMES \
+ { "spur", "lev1", "lev2", "lev3", "lev4", "clock", "lev6", "nmi" }
+
/* Zilog Serial hardware interrupts (hard-wired at 6) */
#define splzs() splserial() /* aliased to splhigh() */
#define IPL_ZS IPL_SERIAL
Index: src/sys/arch/sun68k/include/types.h
diff -u src/sys/arch/sun68k/include/types.h:1.2 src/sys/arch/sun68k/include/types.h:1.3
--- src/sys/arch/sun68k/include/types.h:1.2 Sun Jan 14 22:34:54 2024
+++ src/sys/arch/sun68k/include/types.h Mon Jan 15 17:40:35 2024
@@ -1,8 +1,7 @@
-/* $NetBSD: types.h,v 1.2 2024/01/14 22:34:54 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.3 2024/01/15 17:40:35 thorpej Exp $ */
#include <m68k/types.h>
-#define __HAVE_LEGACY_INTRCNT
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_MM_MD_KERNACC
#define __HAVE_MM_MD_MMAP
