summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-11-21 20:55:22 +0000
committerjhb <jhb@FreeBSD.org>2002-11-21 20:55:22 +0000
commitfbf4456fd88f390d92b9bb241754e4e59974706f (patch)
treeab28817a4d01ad73f0083ca70447cdfd8d880937 /sys
parent15af9ed077c6747eaa3d7e5a04ec686ce666184c (diff)
downloadFreeBSD-src-fbf4456fd88f390d92b9bb241754e4e59974706f.zip
FreeBSD-src-fbf4456fd88f390d92b9bb241754e4e59974706f.tar.gz
*sigh*. It seems that in the ACPICA code, Intel defines its own APIC_IO
macro for use when parsing MADT tables, thus we always tried to set the interrupt model to APIC. This proved to be harmful on UP machines with IO APIC's (or for UP kernels on SMP machines) since the wrong interrupt routing information would be returned. Pointy hat to: jhb Approved by: re (rwatson)
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/acpica/acpi_machdep.c2
-rw-r--r--sys/i386/acpica/acpi_machdep.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 324cc9d..fbf649b 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -340,7 +340,7 @@ acpi_machdep_init(device_t dev)
acpi_install_wakeup_handler(sc);
-#ifdef APIC_IO
+#ifdef SMP
acpi_SetIntrModel(ACPI_INTR_APIC);
#endif
return (0);
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 324cc9d..fbf649b 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -340,7 +340,7 @@ acpi_machdep_init(device_t dev)
acpi_install_wakeup_handler(sc);
-#ifdef APIC_IO
+#ifdef SMP
acpi_SetIntrModel(ACPI_INTR_APIC);
#endif
return (0);
OpenPOWER on IntegriCloud