diff options
| author | tmm <tmm@FreeBSD.org> | 2001-06-01 13:23:28 +0000 |
|---|---|---|
| committer | tmm <tmm@FreeBSD.org> | 2001-06-01 13:23:28 +0000 |
| commit | 9ce8a6234736b0446ecc22b1092f693c658a25be (patch) | |
| tree | dfa10a376890935609a85e9cf3ff54855c2ff66c /sys/amd64 | |
| parent | 831472121170bbeebce019cd7be85fb15d34bd31 (diff) | |
| download | FreeBSD-src-9ce8a6234736b0446ecc22b1092f693c658a25be.zip FreeBSD-src-9ce8a6234736b0446ecc22b1092f693c658a25be.tar.gz | |
Clean up the code exporting interrupt statistics via sysctl a bit:
- move the sysctl code to kern_intr.c
- do not use INTRCNT_COUNT, but rather eintrcnt - intrcnt to determine
the length of the intrcnt array
- move the declarations of intrnames, eintrnames, intrcnt and eintrcnt
from machine-dependent include files to sys/interrupt.h
- remove the hw.nintr sysctl, it is not needed.
- fix various style bugs
Requested by: bde
Reviewed by: bde (some time ago)
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 1 | ||||
| -rw-r--r-- | sys/amd64/isa/icu.h | 2 | ||||
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 1 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 1 | ||||
| -rw-r--r-- | sys/amd64/isa/vector.S | 2 | ||||
| -rw-r--r-- | sys/amd64/isa/vector.s | 2 |
6 files changed, 2 insertions, 7 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e02569c1..7fdb9be 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -103,7 +103,6 @@ #include <machine/pc/bios.h> #include <machine/pcb_ext.h> /* pcb.h included via sys/user.h */ #include <machine/globals.h> -#include <machine/intrcnt.h> #ifdef PERFMON #include <machine/perfmon.h> #endif diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h index 0176541..3a7390c 100644 --- a/sys/amd64/isa/icu.h +++ b/sys/amd64/isa/icu.h @@ -126,4 +126,6 @@ extern unsigned imen; /* interrupt mask enable */ #endif /* APIC_IO */ +#define INTRCNT_COUNT (1 + ICU_LEN + 2 * ICU_LEN) + #endif /* !_I386_ISA_ICU_H_ */ diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 7eb99a6..503163f 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -58,7 +58,6 @@ #include <machine/md_var.h> #include <machine/segments.h> -#include <machine/intrcnt.h> #if defined(APIC_IO) #include <machine/smptests.h> /** FAST_HI */ diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 7eb99a6..503163f 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -58,7 +58,6 @@ #include <machine/md_var.h> #include <machine/segments.h> -#include <machine/intrcnt.h> #if defined(APIC_IO) #include <machine/smptests.h> /** FAST_HI */ diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S index 981b858..d3b7a89 100644 --- a/sys/amd64/isa/vector.S +++ b/sys/amd64/isa/vector.S @@ -16,8 +16,6 @@ #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 diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s index 981b858..d3b7a89 100644 --- a/sys/amd64/isa/vector.s +++ b/sys/amd64/isa/vector.s @@ -16,8 +16,6 @@ #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 |
