From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 20:48:31 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADE10106566C;
	Thu,  4 Jun 2009 20:48:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BEBB8FC18;
	Thu,  4 Jun 2009 20:48:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KmVBK003534;
	Thu, 4 Jun 2009 20:48:31 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54KmVMP003533;
	Thu, 4 Jun 2009 20:48:31 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042048.n54KmVMP003533@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 4 Jun 2009 20:48:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193453 -
	projects/acpica_20090521/sys/contrib/dev/acpica/tables
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2009 20:48:32 -0000

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