Do not install SSDT when DSDT is overriden by user.

This commit is contained in:
Jung-uk Kim 2009-06-04 20:48:31 +00:00
parent 2e03f452c4
commit 92ebb4adfe
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/projects/acpica_20090521/; revision=193453

View File

@ -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 &&