diff options
| author | eadler <eadler@FreeBSD.org> | 2012-10-22 13:06:09 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-10-22 13:06:09 +0000 |
| commit | 92f340b6e7dc02801983812c792c7d3964d31ef7 (patch) | |
| tree | 07e19b18864f030899e170c445daf41bd547c6d1 /sys/i386 | |
| parent | a9d460420e5a6206b25b2ffac4bcaa0d37cc837a (diff) | |
| download | FreeBSD-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')
| -rw-r--r-- | sys/i386/acpica/acpi_machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 3 |
2 files changed, 6 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 diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 5477383..bf5071f 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -878,6 +878,9 @@ apm_identify(driver_t *driver, device_t parent) return; } + if (resource_disabled("apm", 0)) + return; + child = BUS_ADD_CHILD(parent, 0, "apm", 0); if (child == NULL) panic("apm_identify"); |
