diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2009-06-04 20:48:31 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2009-06-04 20:48:31 +0000 |
| commit | 92ebb4adfe19ef96df6d62c2d8d54e072fe76416 (patch) | |
| tree | a073a2615b2048d1935fd7b8a363d06ea9572799 /sys/contrib/dev | |
| parent | 2e03f452c4eb1da5698ed44a899d6e76e0718cb7 (diff) | |
Notes
Diffstat (limited to 'sys/contrib/dev')
| -rw-r--r-- | sys/contrib/dev/acpica/tables/tbutils.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/tables/tbutils.c b/sys/contrib/dev/acpica/tables/tbutils.c index d4923174d287e..28cd8dcbcae94 100644 --- a/sys/contrib/dev/acpica/tables/tbutils.c +++ b/sys/contrib/dev/acpica/tables/tbutils.c @@ -360,6 +360,21 @@ AcpiTbInstallTable ( return; } + /* Skip SSDT when DSDT is overriden */ + + if (ACPI_COMPARE_NAME (MappedTable->Signature, ACPI_SIG_SSDT) && + (AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Flags & + ACPI_TABLE_ORIGIN_OVERRIDE)) + { + ACPI_INFO ((AE_INFO, + "%4.4s @ 0x%p Table override, replaced with:", ACPI_SIG_SSDT, + ACPI_CAST_PTR (void, Address))); + AcpiTbPrintTableHeader ( + AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Address, + AcpiGbl_RootTableList.Tables[ACPI_TABLE_INDEX_DSDT].Pointer); + goto UnmapAndExit; + } + /* If a particular signature is expected (DSDT/FACS), it must match */ if (Signature && |