summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2001-10-31 02:36:07 +0000
committermsmith <msmith@FreeBSD.org>2001-10-31 02:36:07 +0000
commitde8bc4ba10fb07aa68c4cd0d79b35529c6b1b958 (patch)
treeda9e8b6becd34ab0ca163a295cb7ed093e3b6b61 /sys/i386
parent05445bb80c710a64dfe36c3d64d56b17e1d47399 (diff)
downloadFreeBSD-src-de8bc4ba10fb07aa68c4cd0d79b35529c6b1b958.zip
FreeBSD-src-de8bc4ba10fb07aa68c4cd0d79b35529c6b1b958.tar.gz
Don't try to probe the PnP BIOS if ACPI is active.
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/bios.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 6755253..cc887e7 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -523,6 +523,11 @@ pnpbios_identify(driver_t *driver, device_t parent)
if (pt == NULL)
return;
+ /* ACPI already active */
+ if (devclass_get_softc(devclass_find("ACPI"), 0) != NULL)
+ return;
+
+ /* get count of PnP devices */
bzero(&args, sizeof(args));
args.seg.code16.base = BIOS_PADDRTOVADDR(pt->pmentrybase);
args.seg.code16.limit = 0xffff; /* XXX ? */
OpenPOWER on IntegriCloud