diff options
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/psl.h | 17 | ||||
| -rw-r--r-- | sys/arch/i386/include/types.h | 3 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h index 7fa516a214c..27545225f3d 100644 --- a/sys/arch/i386/include/psl.h +++ b/sys/arch/i386/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.15 2004/02/02 23:02:42 deraadt Exp $ */ +/* $OpenBSD: psl.h,v 1.16 2004/06/28 01:41:53 aaron Exp $ */ /* $NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $ */ /*- @@ -75,19 +75,20 @@ #ifndef _LOCORE +#include <sys/evcount.h> + /* * Interrupt handler chains. isa_intr_establish() inserts a handler into * the list. The handler is called with its (single) argument. */ struct intrhand { - int (*ih_fun)(void *); - void *ih_arg; - u_long ih_count; - struct intrhand *ih_next; - int ih_level; - int ih_irq; - char *ih_what; + int (*ih_fun)(void *); + void *ih_arg; + struct intrhand *ih_next; + int ih_level; + int ih_irq; + struct evcount ih_count; }; #endif /* _LOCORE */ diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h index 53f8a187136..7262847c9cc 100644 --- a/sys/arch/i386/include/types.h +++ b/sys/arch/i386/include/types.h @@ -1,5 +1,5 @@ /* $NetBSD: types.h,v 1.12 1995/12/24 01:08:03 mycroft Exp $ */ -/* $OpenBSD: types.h,v 1.14 2004/06/13 21:49:16 niklas Exp $ */ +/* $OpenBSD: types.h,v 1.15 2004/06/28 01:41:53 aaron Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -72,6 +72,7 @@ typedef unsigned long long uint64_t; typedef int32_t register_t; #define __HAVE_NWSCONS +#define __HAVE_EVCOUNT #define __HAVE_CPUINFO #endif /* _MACHTYPES_H_ */ |