[src/trunk]: src/sys/arch/x86/x86 Compile in the !MPACPI && NIOAPIC case.

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4b45bd28e3e6
branches:  trunk
changeset: 551247:4b45bd28e3e6
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Tue Sep 02 20:10:30 2003 +0000

description:
Compile in the !MPACPI && NIOAPIC case.

diffstat:

 sys/arch/x86/x86/acpi_machdep.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 9f67d8f0f5ba -r 4b45bd28e3e6 sys/arch/x86/x86/acpi_machdep.c
--- a/sys/arch/x86/x86/acpi_machdep.c   Tue Sep 02 20:01:59 2003 +0000
+++ b/sys/arch/x86/x86/acpi_machdep.c   Tue Sep 02 20:10:30 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_machdep.c,v 1.2 2003/08/27 11:38:54 itojun Exp $  */
+/*     $NetBSD: acpi_machdep.c,v 1.3 2003/09/02 20:10:30 fvdl Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.2 2003/08/27 11:38:54 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.3 2003/09/02 20:10:30 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,10 +118,10 @@
 #ifdef MPACPI
        int i, h;
        struct mp_intr_map *mip;
+#endif
 #if NIOAPIC > 0
        struct ioapic_softc *sc;
 #endif
-#endif
 
        if (acpi_intrcold) {
                aip = malloc(sizeof(struct acpi_intr_defer), M_TEMP, M_WAITOK);
@@ -138,7 +138,7 @@
 
        trigger = IST_LEVEL;
 
-#ifdef MPACPI
+#if defined(MPACPI) && NIOAPIC > 0
        /*
         * Can only match on ACPI global interrupt numbers if the ACPI
         * interrupt info was extracted, which is in the MPACPI case.
@@ -193,7 +193,7 @@
                irq = pin = (int)InterruptNumber;
        }
 
-#ifdef MPACPI
+#if defined(MPACPI) && NIOAPIC > 0
 found:
 #endif