diff options
author | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
commit | ca7944e4059769f0f5788417db3d8f3b2a8e7996 (patch) | |
tree | 3858a454e4df3ea62639923664ce32f0d9706e26 /sys/dev | |
parent | 4cdc15c1f748d4763888b9351c2316a878059a87 (diff) | |
parent | af69f95bba3597db53a980597cfd371c9f6ee7cf (diff) | |
download | FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.zip FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.tar.gz |
Merge ACPICA 20130517.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/acpica/Osd/OsdTable.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c index 8e8fe47..1e738f8 100644 --- a/sys/dev/acpica/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -76,11 +76,11 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, return (AE_BAD_PARAMETER); *NewTable = NULL; + if (!ACPI_COMPARE_NAME(ExistingTable->Signature, ACPI_SIG_DSDT)) #ifdef notyet - for (int i = 0; i < ACPI_NAME_SIZE; i++) - modname[i + 5] = tolower(ExistingTable->Signature[i]); + for (int i = 0; i < ACPI_NAME_SIZE; i++) + modname[i + 5] = tolower(ExistingTable->Signature[i]); #else - if (!ACPI_COMPARE_NAME(ExistingTable->Signature, ACPI_SIG_DSDT)) return (AE_SUPPORT); #endif acpi_table = preload_search_by_type(modname); @@ -90,6 +90,10 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, sz = preload_fetch_size(acpi_table); if (hdr == NULL || sz == 0) return (AE_ERROR); +#ifndef notyet + /* Assume SSDT is loaded with DSDT. */ + AcpiGbl_DisableSsdtTableLoad = TRUE; +#endif *NewTable = hdr; return (AE_OK); } |