diff options
Diffstat (limited to 'sys/arch')
31 files changed, 31 insertions, 417 deletions
diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s index 6c25d64c7ad..8ed599af4ff 100644 --- a/sys/arch/alpha/alpha/locore.s +++ b/sys/arch/alpha/alpha/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.26 2004/07/03 19:22:57 deraadt Exp $ */ +/* $OpenBSD: locore.s,v 1.27 2004/12/24 22:50:27 miod Exp $ */ /* $NetBSD: locore.s,v 1.94 2001/04/26 03:10:44 ross Exp $ */ /*- @@ -1457,21 +1457,6 @@ END(copyerr) /**************************************************************************/ - .data -/* Some bogus data, to keep vmstat happy, for now. */ -EXPORT(intrnames) - .type intrnames,@object -EXPORT(eintrnames) - .type eintrnames,@object - .align 3 -EXPORT(intrcnt) - .type intrcnt,@object -EXPORT(eintrcnt) - .type eintrcnt,@object - .text - -/**************************************************************************/ - /* * console 'restart' routine to be placed in HWRPB. */ diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S index e269c7f60ae..cee8277ec7c 100644 --- a/sys/arch/amd64/amd64/vector.S +++ b/sys/arch/amd64/amd64/vector.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.S,v 1.5 2004/07/10 14:21:40 art Exp $ */ +/* $OpenBSD: vector.S,v 1.6 2004/12/24 22:50:29 miod Exp $ */ /* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */ /* @@ -726,18 +726,6 @@ _C_LABEL(ioapic_level_stubs): #endif .data -/* - * Symbols that vmstat -i wants, even though they're not used. - */ - .globl _C_LABEL(intrnames) -_C_LABEL(intrnames): - .globl _C_LABEL(eintrnames) -_C_LABEL(eintrnames): - - .globl _C_LABEL(intrcnt) -_C_LABEL(intrcnt): - .globl _C_LABEL(eintrcnt) -_C_LABEL(eintrcnt): /* * Soft interrupt handlers diff --git a/sys/arch/arm/arm/irq_dispatch.S b/sys/arch/arm/arm/irq_dispatch.S index 0874a16644b..fe61790fa9d 100644 --- a/sys/arch/arm/arm/irq_dispatch.S +++ b/sys/arch/arm/arm/irq_dispatch.S @@ -1,4 +1,4 @@ -/* $OpenBSD: irq_dispatch.S,v 1.2 2004/02/01 06:10:33 drahn Exp $ */ +/* $OpenBSD: irq_dispatch.S,v 1.3 2004/12/24 22:50:29 miod Exp $ */ /* $NetBSD: irq_dispatch.S,v 1.5 2003/10/30 08:57:24 scw Exp $ */ /* @@ -139,17 +139,3 @@ _C_LABEL(astpending): .global _C_LABEL(current_intr_depth) _C_LABEL(current_intr_depth): .word 0 - - /* - * XXX Provide intrnames/intrcnt for legacy code, but - * don't actually use them. - */ - - .global _C_LABEL(intrnames), _C_LABEL(eintrnames) - .global _C_LABEL(intrcnt), _C_LABEL(eintrcnt) -_C_LABEL(intrnames): -_C_LABEL(eintrnames): - - .global _C_LABEL(intrcnt), _C_LABEL(sintrcnt), _C_LABEL(eintrcnt) -_C_LABEL(intrcnt): -_C_LABEL(eintrcnt): diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 68eb53836aa..d1b3c4d3933 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.13 2004/09/29 07:35:54 miod Exp $ */ +/* $OpenBSD: intr.c,v 1.14 2004/12/24 22:50:29 miod Exp $ */ /* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */ /*- @@ -69,8 +69,6 @@ isr_list_t isr_list[NISR]; u_short hp300_bioipl, hp300_netipl, hp300_ttyipl, hp300_impipl; -extern int intrcnt[]; /* from locore.s */ - void intr_computeipl(void); void @@ -253,7 +251,6 @@ intr_dispatch(evec) #endif ipl = vec - ISRLOC; - intrcnt[ipl]++; uvmexp.intrs++; list = &isr_list[ipl]; diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 12f2001e8e5..db8bc017829 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.42 2004/09/29 07:35:54 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.43 2004/12/24 22:50:29 miod Exp $ */ /* $NetBSD: locore.s,v 1.91 1998/11/11 06:41:25 thorpej Exp $ */ /* @@ -1002,7 +1002,6 @@ Lbrkpt3: #define INTERRUPT_RESTOREREG moveml sp@+,#0x0303 ENTRY_NOPROFILE(spurintr) /* level 0 */ - addql #1,_C_LABEL(intrcnt)+0 addql #1,_C_LABEL(uvmexp)+UVMEXP_INTRS jra _ASM_LABEL(rei) @@ -1010,7 +1009,6 @@ ENTRY_NOPROFILE(lev1intr) /* level 1: HIL XXX this needs to go away */ INTERRUPT_SAVEREG jbsr _C_LABEL(hilint) INTERRUPT_RESTOREREG - addql #1,_C_LABEL(intrcnt)+4 addql #1,_C_LABEL(uvmexp)+UVMEXP_INTRS jra _ASM_LABEL(rei) @@ -1035,7 +1033,6 @@ Lnotim1: btst #2,d0 | timer3 interrupt? jeq Lnotim3 | no, skip statclock movpw a0@(CLKMSB3),d1 | clear timer3 interrupt - addql #1,_C_LABEL(intrcnt)+28 | count clock interrupts lea sp@(16),a1 | a1 = &clockframe movl d0,sp@- | save status movl a1,sp@- @@ -1046,7 +1043,6 @@ Lnotim1: Lnotim3: btst #0,d0 | timer1 interrupt? jeq Lrecheck | no, skip hardclock - addql #1,_C_LABEL(intrcnt)+24 | count hardclock interrupts lea sp@(16),a1 | a1 = &clockframe movl a1,sp@- #ifdef USELEDS @@ -1089,7 +1085,6 @@ Lrecheck: jra _ASM_LABEL(rei) | all done ENTRY_NOPROFILE(lev7intr) /* level 7: parity errors, reset key */ - addql #1,_C_LABEL(intrcnt)+32 clrl sp@- moveml #0xFFFF,sp@- | save registers movl usp,a0 | and save @@ -2006,21 +2001,3 @@ ASGLOBAL(fulltflush) ASGLOBAL(fullcflush) .long 0 #endif - -/* interrupt counters */ -GLOBAL(intrnames) - .asciz "spur" - .asciz "hil" - .asciz "lev2" - .asciz "lev3" - .asciz "lev4" - .asciz "lev5" - .asciz "clock" - .asciz "statclock" - .asciz "nmi" -GLOBAL(eintrnames) - .even - -GLOBAL(intrcnt) - .long 0,0,0,0,0,0,0,0,0 -GLOBAL(eintrcnt) diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 71a32e75dba..5d4c2cd6567 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.142 2004/10/26 20:18:01 mickey Exp $ */ +/* $OpenBSD: locore.S,v 1.143 2004/12/24 22:50:29 miod Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -139,17 +139,6 @@ cpu_itmr /* itmr value at the most recent clk int */ .export hppa_vtop, data BSS(hppa_vtop, 4) /* a vtop translation table addr (pa=va) */ - .export intrcnt, data - .export eintrcnt, data - .export intrnames, data - .export eintrnames, data -intrcnt - .word 0 -eintrcnt -intrnames - .word 0 -eintrnames - .text .import $kernel_setup, entry diff --git a/sys/arch/i386/i386/vector.s b/sys/arch/i386/i386/vector.s index 828dbd9df70..be65126dec3 100644 --- a/sys/arch/i386/i386/vector.s +++ b/sys/arch/i386/i386/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.5 2004/12/24 21:22:00 pvalchev Exp $ */ +/* $OpenBSD: vector.s,v 1.6 2004/12/24 22:50:29 miod Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -250,13 +250,3 @@ IDTVEC(recurse) .long _C_LABEL(Xsofttty), _C_LABEL(Xsoftnet) .long _C_LABEL(Xsoftclock) .long 0, 0 - -/* Some bogus data, to keep vmstat happy, for now. */ - .globl _C_LABEL(intrnames), _C_LABEL(eintrnames) - .globl _C_LABEL(intrcnt), _C_LABEL(eintrcnt) -_C_LABEL(intrnames): - .long 0 -_C_LABEL(eintrnames): -_C_LABEL(intrcnt): - .long 0 -_C_LABEL(eintrcnt): diff --git a/sys/arch/luna88k/include/intr.h b/sys/arch/luna88k/include/intr.h index b76e6cfff65..31af8d4433a 100644 --- a/sys/arch/luna88k/include/intr.h +++ b/sys/arch/luna88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.2 2004/04/26 12:34:05 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.3 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -30,37 +30,6 @@ #define _LUNA88K_INTR_H_ /* - * INTERRUPT STAT levels. for 'systat vmstat' - * intrcnt and friends are defined in locore.S - * XXX smurph - */ - -#ifndef _LOCORE - -#define M88K_NIRQ 12 - -#define M88K_SPUR_IRQ 0 -#define M88K_LEVEL1_IRQ 1 -#define M88K_LEVEL2_IRQ 2 -#define M88K_LEVEL3_IRQ 3 -#define M88K_LEVEL4_IRQ 4 -#define M88K_LEVEL5_IRQ 5 -#define M88K_LEVEL6_IRQ 6 -#define M88K_LEVEL7_IRQ 7 -/* - * We keep track of these separately, but - * they will be reflected with the above also. - */ -#define M88K_CLK_IRQ 8 -#define M88K_SCLK_IRQ 9 -#define M88K_PCLK_IRQ 10 -#define M88K_NMI_IRQ 11 - -extern int intrcnt[M88K_NIRQ]; - -#endif - -/* * IPL levels. */ diff --git a/sys/arch/luna88k/luna88k/clock.c b/sys/arch/luna88k/luna88k/clock.c index 4fe62d17ac4..ca93142847d 100644 --- a/sys/arch/luna88k/luna88k/clock.c +++ b/sys/arch/luna88k/luna88k/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.2 2004/08/18 13:29:46 aoyama Exp $ */ +/* $OpenBSD: clock.c,v 1.3 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: clock.c,v 1.2 2000/01/11 10:29:35 nisimura Exp $ */ /* @@ -226,7 +226,6 @@ clockintr(void *eframe) extern unsigned int *clock_reg[]; int cpu = cpu_number(); - intrcnt[M88K_CLK_IRQ]++; clockevc->ec_count++; *clock_reg[cpu] = 0xffffffff; diff --git a/sys/arch/luna88k/luna88k/isr.c b/sys/arch/luna88k/luna88k/isr.c index 7ceabe4bf6f..0081f93bba5 100644 --- a/sys/arch/luna88k/luna88k/isr.c +++ b/sys/arch/luna88k/luna88k/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.2 2004/07/27 12:36:34 miod Exp $ */ +/* $OpenBSD: isr.c,v 1.3 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: isr.c,v 1.5 2000/07/09 08:08:20 nisimura Exp $ */ /*- @@ -57,8 +57,6 @@ isr_autovec_list_t isr_autovec[NISRAUTOVEC]; -extern int intrcnt[]; /* from locore.s */ - void isrinit() { @@ -163,7 +161,6 @@ isrdispatch_autovec(int ipl) panic("isrdispatch_autovec: bad ipl 0x%d\n", ipl); #endif - intrcnt[ipl]++; #if 0 /* XXX: already counted in machdep.c */ uvmexp.intrs++; #endif diff --git a/sys/arch/luna88k/luna88k/locore.S b/sys/arch/luna88k/luna88k/locore.S index de7336ed029..c4d9a9aebcf 100644 --- a/sys/arch/luna88k/luna88k/locore.S +++ b/sys/arch/luna88k/luna88k/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.6 2004/08/24 12:59:51 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.7 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -506,23 +506,3 @@ GLOBAL(sigcode) /* r31 points to sigframe */ NOP NOP GLOBAL(esigcode) - -/* interrupt counters */ -GLOBAL(intrnames) - string "spur\0" - string "lev1\0" - string "lev2\0" - string "lev3\0" - string "lev4\0" - string "lev5\0" - string "lev6\0" - string "lev7\0" - string "clk\0" - string "sclk\0" - string "pclk\0" - string "nmi\0" -GLOBAL(eintrnames) - .align 8 -GLOBAL(intrcnt) - word 0,0,0,0,0,0,0,0,0,0,0,0 -GLOBAL(eintrcnt) diff --git a/sys/arch/mac68k/mac68k/intr.c b/sys/arch/mac68k/mac68k/intr.c index 247b905f5ac..08ba38914cd 100644 --- a/sys/arch/mac68k/mac68k/intr.c +++ b/sys/arch/mac68k/mac68k/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.3 2004/12/02 22:00:31 martin Exp $ */ +/* $OpenBSD: intr.c,v 1.4 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: intr.c,v 1.2 1998/08/25 04:03:56 scottr Exp $ */ /*- @@ -77,7 +77,6 @@ u_short mac68k_clockipl; u_short mac68k_statclockipl; struct intrhand intrs[NISR]; -extern int intrcnt[]; /* from locore.s */ void intr_computeipl(void); diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s index 3f8ba0abd9a..335b1c75f09 100644 --- a/sys/arch/mac68k/mac68k/locore.s +++ b/sys/arch/mac68k/mac68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.41 2004/12/01 23:02:55 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.42 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */ /* @@ -1925,9 +1925,3 @@ ASGLOBAL(fulltflush) ASGLOBAL(fullcflush) .long 0 #endif - -/* old interrupt counters */ -GLOBAL(intrnames) -GLOBAL(eintrnames) -GLOBAL(intrcnt) -GLOBAL(eintrcnt) diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S index 9d088311699..7e5dda6ce8a 100644 --- a/sys/arch/macppc/macppc/locore.S +++ b/sys/arch/macppc/macppc/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.19 2004/11/17 20:09:50 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.20 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */ /* @@ -1155,19 +1155,6 @@ _C_LABEL(sigcode): _C_LABEL(esigcode): - - .data -/* Some bogus data, to keep vmstat happy, for now. */ - .globl _C_LABEL(intrnames), _C_LABEL(eintrnames) - .globl _C_LABEL(intrcnt), _C_LABEL(eintrcnt) -_C_LABEL(intrnames): - .long 0 -_C_LABEL(eintrnames): -_C_LABEL(intrcnt): - .long 0 -_C_LABEL(eintrcnt): - - #ifdef DDB /* * Deliberate entry to ddbtrap diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index b67f6829788..6f6b4ec05f2 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.19 2004/12/06 20:12:24 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.20 2004/12/24 22:50:30 miod Exp $ */ /* tracked to 1.23 */ /* @@ -143,7 +143,6 @@ extern void idle __P((void)); int kdb_trap(int, db_regs_t *); #endif -extern u_long intrcnt[]; extern void MipsSwitchFPState(struct proc *, struct trap_frame *); extern void MipsSwitchFPState16(struct proc *, struct trap_frame *); extern void MipsFPTrap(u_int, u_int, u_int, union sigval); diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s index 8700a73ec4c..09b3f9168df 100644 --- a/sys/arch/mvme68k/mvme68k/locore.s +++ b/sys/arch/mvme68k/mvme68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.45 2004/12/01 21:13:59 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.46 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -1091,7 +1091,6 @@ Lbrkpt3: */ ENTRY_NOPROFILE(spurintr) - addql #1,_C_LABEL(intrcnt)+0 addql #1,_C_LABEL(uvmexp)+UVMEXP_INTRS jra _ASM_LABEL(rei) | all done @@ -1928,22 +1927,4 @@ ASGLOBAL(fullcflush) .long 0 #endif -/* interrupt counters */ -GLOBAL(intrnames) - .asciz "spur" - .asciz "lev1" - .asciz "lev2" - .asciz "lev3" - .asciz "lev4" - .asciz "clock" - .asciz "lev6" - .asciz "nmi" - .asciz "statclock" -GLOBAL(eintrnames) - .even - -GLOBAL(intrcnt) - .long 0,0,0,0,0,0,0,0,0,0 -GLOBAL(eintrcnt) - #include <mvme68k/mvme68k/vectors.s> diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index e88700dfaee..dcc3903d12d 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.56 2004/12/06 20:12:25 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.57 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -1179,14 +1179,12 @@ hardintr(pc, evec, frame) { extern void straytrap(int, u_short); int vec = (evec & 0xfff) >> 2; /* XXX should be m68k macro? */ - /*extern u_long intrcnt[];*/ /* XXX from locore */ struct intrhand *ih; intrhand_t *list; int count = 0; int r; uvmexp.intrs++; -/* intrcnt[level]++; */ list = &intrs[vec]; if (SLIST_EMPTY(list)) { diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c index 50436c966a2..f01bb4d766a 100644 --- a/sys/arch/mvme88k/dev/clock.c +++ b/sys/arch/mvme88k/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.43 2004/11/08 16:39:31 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.44 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt @@ -282,8 +282,6 @@ sbc_clockintr(void *eframe) *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) = prof_reset; - intrcnt[M88K_CLK_IRQ]++; - hardclock(eframe); #if NBUGTTY > 0 bugtty_chkinput(); @@ -300,8 +298,6 @@ sbc_statintr(void *eframe) *(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T2ICR) = stat_reset; - intrcnt[M88K_SCLK_IRQ]++; - statclock((struct clockframe *)eframe); /* @@ -420,7 +416,6 @@ m188_clockintr(void *eframe) CIO_LOCK; write_cio(CIO_CSR1, CIO_GCB | CIO_CIP); /* Ack the interrupt */ - intrcnt[M88K_CLK_IRQ]++; hardclock(eframe); #if NBUGTTY > 0 bugtty_chkinput(); @@ -443,7 +438,6 @@ m188_statintr(void *eframe) tmp = *(volatile u_int32_t *)DART_STOPC; tmp = *(volatile u_int32_t *)DART_ISR; - intrcnt[M88K_SCLK_IRQ]++; statclock((struct clockframe *)eframe); /* diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h index 9bd3af030ce..01962559ffc 100644 --- a/sys/arch/mvme88k/include/intr.h +++ b/sys/arch/mvme88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.15 2004/04/26 12:34:05 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.16 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -28,36 +28,6 @@ #ifndef _MVME88K_INTR_H_ #define _MVME88K_INTR_H_ -/* - * INTERRUPT STAT levels. for 'systat vmstat' - * intrcnt and friends are defined in locore.S - * XXX smurph - */ - -#ifndef _LOCORE - -#define M88K_NIRQ 12 - -#define M88K_SPUR_IRQ 0 -#define M88K_LEVEL1_IRQ 1 -#define M88K_LEVEL2_IRQ 2 -#define M88K_LEVEL3_IRQ 3 -#define M88K_LEVEL4_IRQ 4 -#define M88K_LEVEL5_IRQ 5 -#define M88K_LEVEL6_IRQ 6 -#define M88K_LEVEL7_IRQ 7 -/* - * We keep track of these separately, but - * they will be reflected with the above also. - */ -#define M88K_CLK_IRQ 8 -#define M88K_SCLK_IRQ 9 -#define M88K_PCLK_IRQ 10 -#define M88K_NMI_IRQ 11 - -extern int intrcnt[M88K_NIRQ]; - -#endif /* * IPL levels. diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S index d63370a82e7..1ea081bf111 100644 --- a/sys/arch/mvme88k/mvme88k/locore.S +++ b/sys/arch/mvme88k/mvme88k/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.40 2004/11/09 21:50:01 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.41 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -540,23 +540,3 @@ GLOBAL(sigcode) /* r31 points to sigframe */ NOP NOP GLOBAL(esigcode) - -/* interrupt counters */ -GLOBAL(intrnames) - string "spur\0" - string "lev1\0" - string "lev2\0" - string "lev3\0" - string "lev4\0" - string "lev5\0" - string "lev6\0" - string "lev7\0" - string "clk\0" - string "sclk\0" - string "pclk\0" - string "nmi\0" -GLOBAL(eintrnames) - .align 8 -GLOBAL(intrcnt) - word 0,0,0,0,0,0,0,0,0,0,0,0 -GLOBAL(eintrcnt) diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c index c5e8de52a9a..51ffeae0c13 100644 --- a/sys/arch/mvme88k/mvme88k/m187_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m187_machdep.c,v 1.4 2004/11/09 21:50:01 miod Exp $ */ +/* $OpenBSD: m187_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -174,7 +174,6 @@ m187_ext_int(u_int v, struct trapframe *eframe) list = &intr_handlers[vec]; if (SLIST_EMPTY(list)) { /* increment intr counter */ - intrcnt[M88K_SPUR_IRQ]++; printf("Spurious interrupt (level %x and vec %x)\n", level, vec); } else { @@ -200,7 +199,6 @@ m187_ext_int(u_int v, struct trapframe *eframe) else ret = (*intr->ih_fn)(intr->ih_arg); if (ret != 0) { - intrcnt[level]++; intr->ih_count.ec_count++; break; } diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c index 7b97e5a93c9..ab37d4acac9 100644 --- a/sys/arch/mvme88k/mvme88k/m188_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m188_machdep.c,v 1.4 2004/11/09 21:50:01 miod Exp $ */ +/* $OpenBSD: m188_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -396,8 +396,6 @@ m188_ext_int(u_int v, struct trapframe *eframe) list = &intr_handlers[vec]; if (SLIST_EMPTY(list)) { - /* increment intr counter */ - intrcnt[M88K_SPUR_IRQ]++; printf("Spurious interrupt: level = %d vec = 0x%x, " "intbit = %d mask = 0x%b\n", level, vec, intbit, 1 << intbit, IST_STRING); @@ -414,7 +412,6 @@ m188_ext_int(u_int v, struct trapframe *eframe) else ret = (*intr->ih_fn)(intr->ih_arg); if (ret != 0) { - intrcnt[level]++; intr->ih_count.ec_count++; break; } diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c index 5d6d031f5d6..65be66dae30 100644 --- a/sys/arch/mvme88k/mvme88k/m197_machdep.c +++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m197_machdep.c,v 1.4 2004/11/09 21:50:01 miod Exp $ */ +/* $OpenBSD: m197_machdep.c,v 1.5 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -197,8 +197,6 @@ m197_ext_int(u_int v, struct trapframe *eframe) list = &intr_handlers[vec]; if (SLIST_EMPTY(list)) { - /* increment intr counter */ - intrcnt[M88K_SPUR_IRQ]++; printf("Spurious interrupt (level %x and vec %x)\n", level, vec); } else { @@ -224,7 +222,6 @@ m197_ext_int(u_int v, struct trapframe *eframe) else ret = (*intr->ih_fn)(intr->ih_arg); if (ret != 0) { - intrcnt[level]++; intr->ih_count.ec_count++; break; } diff --git a/sys/arch/mvmeppc/dev/clock.c b/sys/arch/mvmeppc/dev/clock.c index 61a7af3cd6e..b2b90412c4b 100644 --- a/sys/arch/mvmeppc/dev/clock.c +++ b/sys/arch/mvmeppc/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.9 2004/05/14 20:38:32 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.10 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $ */ /* @@ -302,9 +302,6 @@ decr_intr(struct clockframe *frame) nextstatevent += statmin + r; } - /* only count timer ticks for CLK_IRQ */ - intrcnt[PPC_STAT_IRQ] += nstats; - if (nexttimerevent < nextstatevent) nextevent = nexttimerevent; else @@ -337,7 +334,6 @@ decr_intr(struct clockframe *frame) while (lasttb < prevtb - ticks_per_intr) { /* sync lasttb with hardclock */ lasttb += ticks_per_intr; - intrcnt[PPC_CLK_IRQ]++; hardclock(frame); } @@ -345,7 +341,6 @@ decr_intr(struct clockframe *frame) while (lasttb < prevtb) { /* sync lasttb with hardclock */ lasttb += ticks_per_intr; - intrcnt[PPC_CLK_IRQ]++; hardclock(frame); #if NBUGTTY > 0 { diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c index da618ab7e20..d4a928ff0e1 100644 --- a/sys/arch/mvmeppc/dev/openpic.c +++ b/sys/arch/mvmeppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.19 2004/11/19 22:11:54 miod Exp $ */ +/* $OpenBSD: openpic.c,v 1.20 2004/12/24 22:50:30 miod Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -964,7 +964,6 @@ ext_intr_openpic() } irq = virq[realirq]; - intrcnt[realirq]++; /* XXX check range */ diff --git a/sys/arch/mvmeppc/mvmeppc/locore.S b/sys/arch/mvmeppc/mvmeppc/locore.S index e8e2b2b5f30..782b1c3f9af 100644 --- a/sys/arch/mvmeppc/mvmeppc/locore.S +++ b/sys/arch/mvmeppc/mvmeppc/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.9 2004/11/17 20:10:26 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.10 2004/12/24 22:50:30 miod Exp $ */ /* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */ /* @@ -1135,59 +1135,6 @@ _C_LABEL(sigcode): _C_LABEL(esigcode): - - .data - .globl _C_LABEL(intrnames) - .type _C_LABEL(intrnames),@object - .globl _C_LABEL(eintrnames) - .type _C_LABEL(eintrnames),@object -_C_LABEL(intrnames): - .string "irq0" "irq1" "irq2" "irq3" - .string "irq4" "irq5" "irq6" "irq7" - .string "irq8" "irq9" "irq10" "irq11" - .string "irq12" "irq13" "irq14" "irq15" - .string "irq16" "irq17" "irq18" "irq19" - .string "irq20" "irq21" "irq22" "irq23" - .string "irq24" "irq25" "irq26" "irq27" - .string "irq28" "irq29" "irq30" "irq31" - .string "irq32" "irq33" "irq34" "irq35" - .string "irq36" "irq37" "irq38" "irq39" - .string "irq40" "irq41" "irq42" "irq43" - .string "irq44" "irq45" "irq46" "irq47" - .string "irq48" "irq49" "irq50" "irq51" - .string "irq52" "irq53" "irq54" "irq55" - .string "irq56" "irq57" "irq58" "irq59" - .string "irq60" "irq61" "irq62" "irq63" - .string "clock" - .string "stat" - .space 512 -_C_LABEL(eintrnames): - .align 4 - .globl _C_LABEL(intrcnt) - .type _C_LABEL(intrcnt),@object - .globl _C_LABEL(eintrcnt) - .type _C_LABEL(eintrcnt),@object -_C_LABEL(intrcnt): - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0,0,0,0 - .long 0 - .long 0 -_C_LABEL(eintrcnt): - #ifdef DDB /* * Deliberate entry to ddbtrap diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index e8a91416ba4..b25f69bc436 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.27 2004/10/01 15:07:36 drahn Exp $ */ +/* $OpenBSD: intr.h,v 1.28 2004/12/24 22:50:30 miod Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -57,7 +57,6 @@ #define PPC_NIRQ 66 #define PPC_CLK_IRQ 64 #define PPC_STAT_IRQ 65 -extern int intrcnt[PPC_NIRQ]; void setsoftclock(void); void clearsoftclock(void); diff --git a/sys/arch/sgi/sgi/locore.S b/sys/arch/sgi/sgi/locore.S index 528a2c259ee..9185998ea0d 100644 --- a/sys/arch/sgi/sgi/locore.S +++ b/sys/arch/sgi/sgi/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.5 2004/10/20 12:49:15 pefo Exp $ */ +/* $OpenBSD: locore.S,v 1.6 2004/12/24 22:50:31 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -66,27 +66,3 @@ start: jal main # main(regs) move a0, zero PANIC("Startup failed!") - - -/* - * Interrupt counters for vmstat. - */ - .data - .globl intrcnt - .globl eintrcnt - .globl intrnames - .globl eintrnames -intrnames: - .asciiz "softclock" - .asciiz "softnet" - .asciiz "local_dma" - .asciiz "local_dev" - .asciiz "isa_dev" - .asciiz "isa_nmi" - .asciiz "clock" - .asciiz "statclock" -eintrnames: - .align 3 -intrcnt: - .word 0,0,0,0,0,0,0,0 -eintrcnt: diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index c985c1a2c03..e8570f2939a 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.60 2004/09/29 07:35:14 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.61 2004/12/24 22:50:31 miod Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -2354,11 +2354,7 @@ softintr_common: wr %l4, PSR_ET, %psr ! song and dance is necessary std %l0, [%sp + CCFSZ + 0] ! set up intrframe/clockframe sll %l3, 2, %l5 - set _C_LABEL(intrcnt), %l4 ! intrcnt[intlev]++; - ld [%l4 + %l5], %o0 std %l2, [%sp + CCFSZ + 8] - inc %o0 - st %o0, [%l4 + %l5] set _C_LABEL(intrhand), %l4 ! %l4 = intrhand[intlev]; ld [%l4 + %l5], %l4 b 3f @@ -2434,11 +2430,7 @@ _C_LABEL(sparc_interrupt_common): wr %l4, PSR_ET, %psr ! song and dance is necessary std %l0, [%sp + CCFSZ + 0] ! set up intrframe/clockframe sll %l3, 2, %l5 - set _C_LABEL(intrcnt), %l4 ! intrcnt[intlev]++; - ld [%l4 + %l5], %o0 std %l2, [%sp + CCFSZ + 8] ! set up intrframe/clockframe - inc %o0 - st %o0, [%l4 + %l5] set _C_LABEL(intrhand), %l4 ! %l4 = intrhand[intlev]; ld [%l4 + %l5], %l4 clr %l5 ! %l5 = 0 @@ -6451,33 +6443,6 @@ _C_LABEL(proc0paddr): .globl slowtrap .globl winuf_invalid -/* interrupt counters XXX THESE BELONG ELSEWHERE (if anywhere) */ - .globl _C_LABEL(intrcnt) ; OTYPE(_C_LABEL(intrcnt)) - .globl _C_LABEL(eintrcnt) ; OTYPE(_C_LABEL(eintrcnt)) - .globl _C_LABEL(intrnames) ; OTYPE(_C_LABEL(intrnames)) - .globl _C_LABEL(eintrnames) ; OTYPE(_C_LABEL(eintrnames)) -_C_LABEL(intrnames): - .asciz "spur" - .asciz "lev1" - .asciz "lev2" - .asciz "lev3" - .asciz "lev4" - .asciz "lev5" - .asciz "lev6" - .asciz "lev7" - .asciz "lev8" - .asciz "lev9" - .asciz "clock" - .asciz "lev11" - .asciz "lev12" - .asciz "lev13" - .asciz "prof" -_C_LABEL(eintrnames): - _ALIGN -_C_LABEL(intrcnt): - .skip 4*15 -_C_LABEL(eintrcnt): - .comm _C_LABEL(nwindows), 4 .comm _C_LABEL(promvec), 4 .comm _C_LABEL(curproc), 4 diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s index 702ff3368c8..d20edf6bca9 100644 --- a/sys/arch/sparc64/sparc64/locore.s +++ b/sys/arch/sparc64/sparc64/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.47 2004/06/28 01:47:41 aaron Exp $ */ +/* $OpenBSD: locore.s,v 1.48 2004/12/24 22:50:31 miod Exp $ */ /* $NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $ */ /* @@ -9513,16 +9513,6 @@ _C_LABEL(ssym): _C_LABEL(proc0paddr): .xword _C_LABEL(u0) ! KVA of proc0 uarea -/* Some bogus data, to keep vmstat happy, for now. */ - .globl _C_LABEL(intrnames), _C_LABEL(eintrnames) - .globl _C_LABEL(intrcnt), _C_LABEL(eintrcnt) -_C_LABEL(intrnames): - .long 0 -_C_LABEL(eintrnames): -_C_LABEL(intrcnt): - .long 0 -_C_LABEL(eintrcnt): - .comm _C_LABEL(nwindows), 4 #ifdef DEBUG diff --git a/sys/arch/vax/vax/intvec.s b/sys/arch/vax/vax/intvec.s index 9b9765013aa..b09cd26c915 100644 --- a/sys/arch/vax/vax/intvec.s +++ b/sys/arch/vax/vax/intvec.s @@ -1,4 +1,4 @@ -/* $OpenBSD: intvec.s,v 1.19 2004/07/07 23:10:46 deraadt Exp $ */ +/* $OpenBSD: intvec.s,v 1.20 2004/12/24 22:50:31 miod Exp $ */ /* $NetBSD: intvec.s,v 1.39 1999/06/28 08:20:48 itojun Exp $ */ /* @@ -425,14 +425,6 @@ noemulate: #endif .word 0xffff # "reserved instruction fault" - .globl _intrnames, _eintrnames, _intrcnt, _eintrcnt -_intrnames: - .long 0 -_eintrnames: -_intrcnt: - .long 0 -_eintrcnt: - .data _scb: .long 0 .globl _scb |