[src/trunk]: src/sys/arch/ia64 Don't provide intrnames or intrcnt, GC intrcnt...

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

details:   https://anonhg.NetBSD.org/src/rev/adf70cfcb1ff
branches:  trunk
changeset: 330067:adf70cfcb1ff
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Jun 20 12:41:34 2014 +0000

description:
Don't provide intrnames or intrcnt, GC intrcnt.h. IA64 has evcnt(9)
support hooked up, so no need for the legacy interface.

diffstat:

 sys/arch/ia64/ia64/locore.S     |  30 +---------------------------
 sys/arch/ia64/include/Makefile  |   4 +-
 sys/arch/ia64/include/intrcnt.h |  43 -----------------------------------------
 3 files changed, 3 insertions(+), 74 deletions(-)

diffs (116 lines):

diff -r 0f71b0f0be4d -r adf70cfcb1ff sys/arch/ia64/ia64/locore.S
--- a/sys/arch/ia64/ia64/locore.S       Fri Jun 20 12:36:31 2014 +0000
+++ b/sys/arch/ia64/ia64/locore.S       Fri Jun 20 12:41:34 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.5 2013/01/06 11:29:35 kiyohara Exp $      */
+/*     $NetBSD: locore.S,v 1.6 2014/06/20 12:41:34 joerg Exp $ */
        
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -36,8 +36,6 @@
 #include <machine/elf_machdep.h>
 #include <sys/syscall.h>
 
-#include <machine/intrcnt.h>
-
 #include "assym.h"
 
        .section .data.proc0,"aw"
@@ -220,32 +218,6 @@
 
 #endif /* MULTIPROCESSOR */
 
-/*
- * Create a default interrupt name table. The first entry (vector 0) is
- * hardwaired to the clock interrupt.
- */
-       .data
-       .align 8
-EXPORT(intrnames)
-       .ascii "clock"
-       .fill INTRNAME_LEN - 5 - 1, 1, ' '
-       .byte 0
-intr_n = 0
-.rept INTRCNT_COUNT - 1
-       .ascii "#"
-       .byte intr_n / 100 + '0'
-       .byte (intr_n % 100) / 10 + '0'
-       .byte intr_n % 10 + '0'
-       .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' '
-       .byte 0
-       intr_n = intr_n + 1
-.endr
-EXPORT(eintrnames)
-       .align 8
-EXPORT(intrcnt)
-       .fill INTRCNT_COUNT, 8, 0
-EXPORT(eintrcnt)
-
        .text
        // in0: image base
 /*STATIC_ENTRY(_reloc, 1)
diff -r 0f71b0f0be4d -r adf70cfcb1ff sys/arch/ia64/include/Makefile
--- a/sys/arch/ia64/include/Makefile    Fri Jun 20 12:36:31 2014 +0000
+++ b/sys/arch/ia64/include/Makefile    Fri Jun 20 12:41:34 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2012/12/26 19:43:09 martin Exp $
+#      $NetBSD: Makefile,v 1.6 2014/06/20 12:41:34 joerg Exp $
 
 INCSDIR= /usr/include/ia64
 
@@ -7,7 +7,7 @@
        cpu.h cpufunc.h dig64.h disklabel.h efi.h \
        elf_machdep.h endian.h endian_machdep.h float.h fpu.h frame.h \
        ia64_cpu.h ieee.h ieeefp.h int_const.h int_fmtio.h int_limits.h \
-       int_mwgwtypes.h int_types.h intr.h intrcnt.h limits.h \
+       int_mwgwtypes.h int_types.h intr.h limits.h \
        loadfile_machdep.h lock.h math.h mca_machdep.h mcontext.h md_var.h \
        mutex.h pal.h param.h pcb.h pmap.h proc.h profile.h pte.h ptrace.h \
        reg.h sal.h rwlock.h setjmp.h signal.h smp.h ssc.h types.h \
diff -r 0f71b0f0be4d -r adf70cfcb1ff sys/arch/ia64/include/intrcnt.h
--- a/sys/arch/ia64/include/intrcnt.h   Fri Jun 20 12:36:31 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/* $NetBSD: intrcnt.h,v 1.1 2006/04/07 14:21:18 cherry Exp $ */
-
-/*-
- * Copyright (c) 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution%CS.CMU.EDU@localhost
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#define        INTRCNT_CLOCK           0
-#define        INTRCNT_ISA_IRQ         (INTRCNT_CLOCK + 1)
-#define        INTRCNT_ISA_IRQ_LEN     16
-#define        INTRCNT_OTHER_BASE      (INTRCNT_ISA_IRQ + INTRCNT_ISA_IRQ_LEN)
-#define        INTRCNT_OTHER_LEN       240
-#define        INTRCNT_COUNT           (INTRCNT_OTHER_BASE + INTRCNT_OTHER_LEN)
-
-/*
- * Maximum name length in intrnames table (including terminating '\0'.
- * Since vmstat(8) assumes a maximum length of 13 (including '\0'), we're
- * pretty much limited to that (unless we don't care about the alignment
- * of the columns :-)
- */
-#define INTRNAME_LEN           13