diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-06-28 01:52:27 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-06-28 01:52:27 +0000 |
| commit | 9c37e1f32dbe8da7496bb5fe00d00e9d3423541f (patch) | |
| tree | 15610a98e1bf6694723cdc62e0747af3ac539908 /sys/arch/amd64/include/intr.h | |
| parent | ad859de0f075c553882080921983e2565d6ec816 (diff) | |
Use new event counter API for interrupt counting on amd64. Based in part
on some changes in the i386 codebase.
Diffstat (limited to 'sys/arch/amd64/include/intr.h')
| -rw-r--r-- | sys/arch/amd64/include/intr.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h index 69d6247e700..cba5f9e11f1 100644 --- a/sys/arch/amd64/include/intr.h +++ b/sys/arch/amd64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.4 2004/06/26 05:29:17 art Exp $ */ +/* $OpenBSD: intr.h,v 1.5 2004/06/28 01:52:26 deraadt Exp $ */ /* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -45,6 +45,8 @@ #ifndef _LOCORE #include <machine/cpu.h> +#include <sys/evcount.h> + /* * Struct describing an interrupt source for a CPU. struct cpu_info * has an array of MAX_INTR_SOURCES of these. The index in the array @@ -103,7 +105,7 @@ struct intrhand { int ih_slot; struct cpu_info *ih_cpu; int ih_irq; - char *ih_what; + struct evcount ih_count; }; #define IMASK(ci,level) (ci)->ci_imask[(level)] @@ -218,8 +220,9 @@ int x86_nmi(void); void intr_calculatemasks(struct cpu_info *); int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *); int intr_allocate_slot(struct pic *, int, int, int, struct cpu_info **, int *, - int *); -void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *); + int *); +void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), + void *, char *); void intr_disestablish(struct intrhand *); void cpu_intr_init(struct cpu_info *); int intr_find_mpmapping(int bus, int pin, int *handle); |