summaryrefslogtreecommitdiffstats
path: root/sys/i386/acpica
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-10-22 13:06:09 +0000
committereadler <eadler@FreeBSD.org>2012-10-22 13:06:09 +0000
commit92f340b6e7dc02801983812c792c7d3964d31ef7 (patch)
tree07e19b18864f030899e170c445daf41bd547c6d1 /sys/i386/acpica
parenta9d460420e5a6206b25b2ffac4bcaa0d37cc837a (diff)
downloadFreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.zip
FreeBSD-src-92f340b6e7dc02801983812c792c7d3964d31ef7.tar.gz
This isn't functionally identical. In some cases a hint to disable
unit 0 would in fact disable all units. This reverts r241856 Approved by: cperciva (implicit)
Diffstat (limited to 'sys/i386/acpica')
-rw-r--r--sys/i386/acpica/acpi_machdep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 42c6c86..0872127 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -268,6 +268,9 @@ acpi_find_table(const char *sig)
vm_paddr_t addr;
int i, count;
+ if (resource_disabled("acpi", 0))
+ return (0);
+
/*
* Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn
* calls pmap_mapbios() to find the RSDP, we assume that we can use
OpenPOWER on IntegriCloud