diff options
| author | bde <bde@FreeBSD.org> | 1997-07-20 10:35:50 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-07-20 10:35:50 +0000 |
| commit | f153ce8d315751e9da875ca31dfc7b733032973f (patch) | |
| tree | 5d9b5b01c870d5e29e3df359d740207b4b72b4da | |
| parent | 21312369d70d9125d6b8ac502c5757f8d10fa172 (diff) | |
| download | FreeBSD-src-f153ce8d315751e9da875ca31dfc7b733032973f.zip FreeBSD-src-f153ce8d315751e9da875ca31dfc7b733032973f.tar.gz | |
Hide definitions that depend on the APIC_IO option from LKMs so that LKMs
break properly if they use these definitions.
Use '#ifdef notyet' instead of '#if 0' to hide temporarily misplaced
declarations.
| -rw-r--r-- | sys/i386/include/ipl.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h index aed6a7a..62c117e 100644 --- a/sys/i386/include/ipl.h +++ b/sys/i386/include/ipl.h @@ -30,12 +30,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ipl.h,v 1.9 1997/05/31 09:16:36 peter Exp $ */ #ifndef _MACHINE_IPL_H_ #define _MACHINE_IPL_H_ +#if defined(KERNEL) && !defined(ACTUALLY_LKM_NOT_KERNEL) + #ifdef APIC_IO #include <i386/isa/apic_ipl.h> #else @@ -78,6 +80,8 @@ #define SWI_AST_MASK SWI_AST_PENDING #define SWI_MASK (~HWI_MASK) +#endif /* KERNEL && !ACTUALLY_LKM_NOT_KERNEL */ + #ifndef LOCORE /* @@ -85,13 +89,13 @@ * ipending and idelayed are changed by interrupt handlers so they are * volatile. */ -#if 0 +#ifdef notyet /* in <sys/interrupt.h> until pci drivers stop hacking on them */ extern unsigned bio_imask; /* group of interrupts masked with splbio() */ #endif extern unsigned cpl; /* current priority level mask */ extern volatile unsigned idelayed; /* interrupts to become pending */ extern volatile unsigned ipending; /* active interrupts masked by cpl */ -#if 0 +#ifdef notyet /* in <sys/interrupt.h> until pci drivers stop hacking on them */ extern unsigned net_imask; /* group of interrupts masked with splimp() */ extern unsigned stat_imask; /* interrupts masked with splstatclock() */ extern unsigned tty_imask; /* group of interrupts masked with spltty() */ |
