diff options
| author | tmm <tmm@FreeBSD.org> | 2001-03-23 03:45:17 +0000 |
|---|---|---|
| committer | tmm <tmm@FreeBSD.org> | 2001-03-23 03:45:17 +0000 |
| commit | 76ba4861cd1cb43f58cdf0c32eafb5669114b1f0 (patch) | |
| tree | 5ace7cdcab3528bb9062b0f26e814c2104d2eedf /sys/amd64/isa | |
| parent | e47209b0dbb141a9bd27e2b40eed1f027f320f68 (diff) | |
| download | FreeBSD-src-76ba4861cd1cb43f58cdf0c32eafb5669114b1f0.zip FreeBSD-src-76ba4861cd1cb43f58cdf0c32eafb5669114b1f0.tar.gz | |
Export intrnames and intrcnt as sysctls (hw.nintr, hw.intrnames and
hw.intrcnt).
Approved by: rwatson
Diffstat (limited to 'sys/amd64/isa')
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 1 | ||||
| -rw-r--r-- | sys/amd64/isa/intr_machdep.h | 3 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 1 | ||||
| -rw-r--r-- | sys/amd64/isa/vector.S | 7 | ||||
| -rw-r--r-- | sys/amd64/isa/vector.s | 7 |
5 files changed, 10 insertions, 9 deletions
diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 9fcab85..99f9761 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -57,6 +57,7 @@ #include <sys/interrupt.h> #include <machine/md_var.h> #include <machine/segments.h> +#include <machine/intrcnt.h> #include <sys/bus.h> #if defined(APIC_IO) diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h index b42c348..9f328e9 100644 --- a/sys/amd64/isa/intr_machdep.h +++ b/sys/amd64/isa/intr_machdep.h @@ -136,9 +136,6 @@ typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss)); #define IDTVEC(name) __CONCAT(X,name) -extern char eintrnames[]; /* end of intrnames[] */ -extern u_long intrcnt[]; /* counts for for each device and stray */ -extern char intrnames[]; /* string table containing device names */ extern u_long *intr_countp[]; /* pointers into intrcnt[] */ extern driver_intr_t *intr_handler[]; /* C entry points of intr handlers */ extern struct ithd *ithds[]; diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 9fcab85..99f9761 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -57,6 +57,7 @@ #include <sys/interrupt.h> #include <machine/md_var.h> #include <machine/segments.h> +#include <machine/intrcnt.h> #include <sys/bus.h> #if defined(APIC_IO) diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S index 68b09b0..981b858 100644 --- a/sys/amd64/isa/vector.S +++ b/sys/amd64/isa/vector.S @@ -16,6 +16,8 @@ #include <i386/isa/isa.h> #endif +#include <machine/intrcnt.h> + #define FAST_INTR_HANDLER_USES_ES 1 #ifdef FAST_INTR_HANDLER_USES_ES #define ACTUALLY_PUSHED 1 @@ -43,16 +45,15 @@ * XXX this doesn't really belong here; everything except the labels * for the endpointers is almost machine-independent. */ -#define NR_INTRNAMES (1 + ICU_LEN + 2 * ICU_LEN) .globl intrcnt, eintrcnt intrcnt: - .space NR_INTRNAMES * 4 + .space INTRCNT_COUNT * 4 eintrcnt: .globl intrnames, eintrnames intrnames: - .space NR_INTRNAMES * 16 + .space INTRCNT_COUNT * 16 eintrnames: .text diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 68b09b0..981b858 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -16,6 +16,8 @@ #include <i386/isa/isa.h> #endif +#include <machine/intrcnt.h> + #define FAST_INTR_HANDLER_USES_ES 1 #ifdef FAST_INTR_HANDLER_USES_ES #define ACTUALLY_PUSHED 1 @@ -43,16 +45,15 @@ * XXX this doesn't really belong here; everything except the labels * for the endpointers is almost machine-independent. */ -#define NR_INTRNAMES (1 + ICU_LEN + 2 * ICU_LEN) .globl intrcnt, eintrcnt intrcnt: - .space NR_INTRNAMES * 4 + .space INTRCNT_COUNT * 4 eintrcnt: .globl intrnames, eintrnames intrnames: - .space NR_INTRNAMES * 16 + .space INTRCNT_COUNT * 16 eintrnames: .text |
