Trash the PnPBIOStable pointer later on when we know that the acpi probe

and attach routines have succeeded so that if they fail we can still use
the PnP BIOS to find ISA on-board devices.  The fact that we do this here
is gross but fixing it properly involves a lot more work.

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index 773bbe8..4e3ae44 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -38,12 +38,6 @@
 ACPI_STATUS
 AcpiOsInitialize(void)
 {
-    /*
-     * Prevent the PnP BIOS code from interfering with our own scan of
-     * ISA devices.
-     */
-    PnPBIOStable = NULL;
-
     return(0);
 }
 
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 76e2e92..f6771e5 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -326,6 +326,12 @@ acpi_machdep_init(device_t dev)
 		return (ENXIO);
 	}
 
+	/*
+	 * XXX: Prevent the PnP BIOS code from interfering with
+	 * our own scan of ISA devices.
+	 */
+	PnPBIOStable = NULL;
+
 	acpi_capm_init(sc);
 
 	acpi_install_wakeup_handler(sc);