From eeb6dba253e225b18bbdbeb739be3565ade9d164 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 6 Sep 2002 17:01:06 +0000
Subject: [PATCH] Attach ACPI children a bit later in attach(), specifically
 after performing any machine dependent initialization.  This allows the MD
 code to set the interrupt routing model so that PCI interrupts are routed
 correctly when using an APIC or SAPIC for example.

---
 sys/dev/acpica/acpi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index b4df2a74182..760777258d9 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -451,8 +451,6 @@ acpi_attach(device_t dev)
 	freeenv(debugpoint);
     }
 #endif
-    if (!acpi_disabled("bus"))
-	acpi_probe_children(dev);
 
     /*
      * Register our shutdown handlers
@@ -502,6 +500,9 @@ acpi_attach(device_t dev)
     /* Register ACPI again to pass the correct argument of pm_func. */
     power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc);
 
+    if (!acpi_disabled("bus"))
+	acpi_probe_children(dev);
+
     error = 0;
 
  out: