diff options
| author | Steve Passe <fsmp@FreeBSD.org> | 1997-07-19 04:00:35 +0000 |
|---|---|---|
| committer | Steve Passe <fsmp@FreeBSD.org> | 1997-07-19 04:00:35 +0000 |
| commit | 1dec61e7c007c43fa37432efd6a005203f0eaa5b (patch) | |
| tree | 354fd5f850c08fd19dd4ce67d5a793ed5795dd4e /sys/kern/subr_smp.c | |
| parent | 797cb61b544586728a9bac35070cd787517669e2 (diff) | |
Notes
Diffstat (limited to 'sys/kern/subr_smp.c')
| -rw-r--r-- | sys/kern/subr_smp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index de10f8cfeb67..3805c2aecbf3 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.16 1997/07/18 19:45:41 smp Exp smp $ + * $Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $ */ #include "opt_smp.h" @@ -45,7 +45,7 @@ #include <machine/mpapic.h> #include <machine/cpufunc.h> #include <machine/segments.h> -#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ +#include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> @@ -1070,8 +1070,12 @@ isa_apic_pin(int isa_irq) int intr; #if defined(SMP_TIMER_NC) +#if defined(APIC_PIN0_TIMER) +#error 'options SMP_TIMER_NC' no longer used, remove & reconfig. +#else if (isa_irq == 0) return -1; +#endif /* APIC_PIN0_TIMER */ #endif /* SMP_TIMER_NC */ for (intr = 0; intr < nintrs; ++intr) { /* check each record */ |