Date: Thu, 4 Jun 2009 20:48:31 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r193453 - projects/acpica_20090521/sys/contrib/dev/acpica/tables Message-ID: <200906042048.n54KmVMP003533@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jun 4 20:48:31 2009 New Revision: 193453 URL: http://svn.freebsd.org/changeset/base/193453 Log: Do not install SSDT when DSDT is overriden by user. Modified: projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c Modified: projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c ============================================================================== --- projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c Thu Jun 4 18:31:12 2009 (r193452) +++ projects/acpica_20090521/sys/contrib/dev/acpica/tables/tbutils.c Thu Jun 4 20:48:31 2009 (r193453) @@ -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 &&
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906042048.n54KmVMP003533>