diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
| commit | 169c29d1b708c51bbae3f546e0adfe0d433b5b7b (patch) | |
| tree | 15b32c155eb85259ca3be610962de5f8aa24b91c /sys/arch/i386/include/psl.h | |
| parent | 7aa5f12551d2fef2475152a3a5c9b9961e14b83a (diff) | |
Merging w/ NetBSD 021796.
speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).
Diffstat (limited to 'sys/arch/i386/include/psl.h')
| -rw-r--r-- | sys/arch/i386/include/psl.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h index 504708dfe52..8f9fbd87901 100644 --- a/sys/arch/i386/include/psl.h +++ b/sys/arch/i386/include/psl.h @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.26 1996/01/07 21:48:35 mycroft Exp $ */ +/* $NetBSD: psl.h,v 1.27 1996/02/01 22:30:56 mycroft Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -97,22 +97,7 @@ #define SIR_TTYMASK ((1 << SIR_TTY) | SIR_CLOCKMASK) #define SIR_ALLMASK (SIR_CLOCKMASK | SIR_NETMASK | SIR_TTYMASK) -#ifndef LOCORE - -/* - * 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 *ih_arg; - u_long ih_count; - struct intrhand *ih_next; - int ih_level; - int ih_irq; - char *ih_what; -}; +#ifndef _LOCORE volatile int cpl, ipending, astpending; int imask[5]; @@ -206,7 +191,7 @@ softintr(mask) #define setsoftnet() softintr(1 << SIR_NET) #define setsofttty() softintr(1 << SIR_TTY) -#endif /* !LOCORE */ +#endif /* !_LOCORE */ #endif /* _KERNEL */ #endif /* !_I386_PSL_H_ */ |