[src/trunk]: src/sys/arch/arm26 Remove old-style interrupt-counting infrastru...

[bjh21 <bjh21%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/86019ef2ebf9
branches:  trunk
changeset: 501801:86019ef2ebf9
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Sun Jan 07 19:39:08 2001 +0000

description:
Remove old-style interrupt-counting infrastructure (intrnames/intrcnt).

diffstat:

 sys/arch/arm26/arm26/intrnames.S |  98 ----------------------------------------
 sys/arch/arm26/arm26/locore.S    |  16 +++++-
 sys/arch/arm26/conf/files.arm26  |   3 +-
 3 files changed, 15 insertions(+), 102 deletions(-)

diffs (146 lines):

diff -r db1eaa59082d -r 86019ef2ebf9 sys/arch/arm26/arm26/intrnames.S
--- a/sys/arch/arm26/arm26/intrnames.S  Sun Jan 07 18:35:54 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/* $NetBSD: intrnames.S,v 1.2 2000/12/09 17:52:45 bjh21 Exp $ */
-/*-
- * Copyright (c) 2000 Ben Harris
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
-/*
- * intrnames.S -- interrupt names for systat etc.
- */
-
-#include <machine/asm.h>
-
-RCSID("$NetBSD: intrnames.S,v 1.2 2000/12/09 17:52:45 bjh21 Exp $")
-
-       .text
-       .global _C_LABEL(intrnames)
-_C_LABEL(intrnames):
-.macro irqname irq
-Lirq\irq:
-       .asciz  "IRQ \irq"
-.endm
-       irqname 0
-       irqname 1
-       irqname 2
-       irqname 3
-       irqname 4
-       irqname 5
-       irqname 6
-       irqname 7
-       irqname 8
-       irqname 9
-       irqname 10
-       irqname 11
-       irqname 12
-       irqname 13
-       irqname 14
-       irqname 15
-Lirq13_0:
-       .asciz  "IRQ 13.0"
-Lirq13_1:
-       .asciz  "IRQ 13.1"
-Lirq13_2:
-       .asciz  "IRQ 13.2"
-Lirq13_3:
-       .asciz  "IRQ 13.3"
-       .global _C_LABEL(eintrnames)
-_C_LABEL(eintrnames):
-       .global _C_LABEL(irqnames)
-_C_LABEL(irqnames):
-       .word   Lirq0
-       .word   Lirq1
-       .word   Lirq2
-       .word   Lirq3
-       .word   Lirq4
-       .word   Lirq5
-       .word   Lirq6
-       .word   Lirq7
-       .word   Lirq8
-       .word   Lirq9
-       .word   Lirq10
-       .word   Lirq11
-       .word   Lirq12
-       .word   Lirq13
-       .word   Lirq14
-       .word   Lirq15
-       .word   Lirq13_0
-       .word   Lirq13_1
-       .word   Lirq13_2
-       .word   Lirq13_3
-
-       .data
-       .global _C_LABEL(intrcnt)
-_C_LABEL(intrcnt):
-       .fill   20, 4
-       .global _C_LABEL(eintrcnt)
-_C_LABEL(eintrcnt):
diff -r db1eaa59082d -r 86019ef2ebf9 sys/arch/arm26/arm26/locore.S
--- a/sys/arch/arm26/arm26/locore.S     Sun Jan 07 18:35:54 2001 +0000
+++ b/sys/arch/arm26/arm26/locore.S     Sun Jan 07 19:39:08 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.7 2000/12/14 20:30:03 bjh21 Exp $ */
+/* $NetBSD: locore.S,v 1.8 2001/01/07 19:39:09 bjh21 Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -460,4 +460,16 @@
         .global _C_LABEL(esigcode)
 _C_LABEL(esigcode):
 
-RCSID("$NetBSD: locore.S,v 1.7 2000/12/14 20:30:03 bjh21 Exp $")
+/*
+ * Dummy symbols for vmstat -i
+ */
+       .global _C_LABEL(intrnames)
+_C_LABEL(intrnames):
+       .global _C_LABEL(eintrnames)
+_C_LABEL(eintrnames):
+       .global _C_LABEL(intrcnt)
+_C_LABEL(intrcnt):
+       .global _C_LABEL(eintrcnt)
+_C_LABEL(eintrcnt):
+
+RCSID("$NetBSD: locore.S,v 1.8 2001/01/07 19:39:09 bjh21 Exp $")
diff -r db1eaa59082d -r 86019ef2ebf9 sys/arch/arm26/conf/files.arm26
--- a/sys/arch/arm26/conf/files.arm26   Sun Jan 07 18:35:54 2001 +0000
+++ b/sys/arch/arm26/conf/files.arm26   Sun Jan 07 19:39:08 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm26,v 1.12 2000/12/29 23:07:30 bjh21 Exp $
+# $NetBSD: files.arm26,v 1.13 2001/01/07 19:39:08 bjh21 Exp $
 
 # Copyright (c) 1997, 1998, 2000 Ben Harris
 # All rights reserved.
@@ -231,7 +231,6 @@
 file   arch/arm26/arm26/copyinout.S
 file   arch/arm26/arm26/except.c
 file   arch/arm26/arm26/irq.c
-file   arch/arm26/arm26/intrnames.S
 file   arch/arm26/arm26/Locore.c
 file   arch/arm26/arm26/machdep.c
 file   arch/arm26/arm26/mem.c