From 309905643392ff30130047951454fe281e4a9bc3 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 26 Dec 1999 16:21:19 +0000
Subject: Don't include <isa/isavar.h> or compile code depending on it when isa
 is not configured.  Including <isa/isavar.h> when it is not used is harmful
 as well as bogus, since it includes "isa_if.h" which is not generated when
 isa is not configured.

---
 sys/i386/isa/intr_machdep.c | 6 ++++++
 sys/i386/isa/nmi.c          | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'sys/i386/isa')

diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 4620006..d1f46ca 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -45,6 +45,8 @@
 
 #include "opt_auto_eoi.h"
 
+#include "isa.h"
+
 #include <sys/param.h>
 #ifndef SMP
 #include <machine/lock.h>
@@ -72,7 +74,9 @@
 #endif
 #include <i386/isa/icu.h>
 
+#if NISA > 0
 #include <isa/isavar.h>
+#endif
 #include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 #ifdef APIC_IO
@@ -304,6 +308,7 @@ isa_strayintr(vcookiep)
 		    "too many stray irq %d's; not logging any more\n", intr);
 }
 
+#if NISA > 0
 /*
  * Return a bitmap of the current interrupt requests.  This is 8259-specific
  * and is only suitable for use at probe time.
@@ -318,6 +323,7 @@ isa_irq_pending()
 	irr2 = inb(IO_ICU2);
 	return ((irr2 << 8) | irr1);
 }
+#endif
 
 int
 update_intr_masks(void)
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 4620006..d1f46ca 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -45,6 +45,8 @@
 
 #include "opt_auto_eoi.h"
 
+#include "isa.h"
+
 #include <sys/param.h>
 #ifndef SMP
 #include <machine/lock.h>
@@ -72,7 +74,9 @@
 #endif
 #include <i386/isa/icu.h>
 
+#if NISA > 0
 #include <isa/isavar.h>
+#endif
 #include <i386/isa/intr_machdep.h>
 #include <sys/interrupt.h>
 #ifdef APIC_IO
@@ -304,6 +308,7 @@ isa_strayintr(vcookiep)
 		    "too many stray irq %d's; not logging any more\n", intr);
 }
 
+#if NISA > 0
 /*
  * Return a bitmap of the current interrupt requests.  This is 8259-specific
  * and is only suitable for use at probe time.
@@ -318,6 +323,7 @@ isa_irq_pending()
 	irr2 = inb(IO_ICU2);
 	return ((irr2 << 8) | irr1);
 }
+#endif
 
 int
 update_intr_masks(void)
-- 
cgit v1.1