From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr  2 21:05:29 2010
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20A4F106566B;
	Fri,  2 Apr 2010 21:05:29 +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 0F0948FC15;
	Fri,  2 Apr 2010 21:05:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o32L5S1B076525;
	Fri, 2 Apr 2010 21:05:28 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o32L5S5A076523;
	Fri, 2 Apr 2010 21:05:28 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201004022105.o32L5S5A076523@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 2 Apr 2010 21:05:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206113 - vendor-sys/acpica/dist/tables
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	<svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, 
	<mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
	<mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2010 21:05:29 -0000

Author: jkim
Date: Fri Apr  2 21:05:28 2010
New Revision: 206113
URL: http://svn.freebsd.org/changeset/base/206113

Log:
  Additional fix for root table size regression.
  
  Set the size of the new root table correctly. Not the current size, but
  the number of current tables + the default increment.
  
  http://git.moblin.org/cgit.cgi/acpica/commit/?id=752d13e80656436cd58e9710225a80c9deb3b053
  
  Obtained from:	Intel

Modified:
  vendor-sys/acpica/dist/tables/tbxface.c

Modified: vendor-sys/acpica/dist/tables/tbxface.c
==============================================================================
--- vendor-sys/acpica/dist/tables/tbxface.c	Fri Apr  2 20:08:44 2010	(r206112)
+++ vendor-sys/acpica/dist/tables/tbxface.c	Fri Apr  2 21:05:28 2010	(r206113)
@@ -300,10 +300,14 @@ AcpiReallocateRootTable (
 
     ACPI_MEMCPY (Tables, AcpiGbl_RootTableList.Tables, CurrentSize);
 
-    /* Update the root table descriptor */
-
+    /*
+     * Update the root table descriptor. The new size will be the current
+     * number of tables plus the increment, independent of the reserved
+     * size of the original table list.
+     */
     AcpiGbl_RootTableList.Tables = Tables;
-    AcpiGbl_RootTableList.Size += ACPI_ROOT_TABLE_SIZE_INCREMENT;
+    AcpiGbl_RootTableList.Size =
+        AcpiGbl_RootTableList.Count + ACPI_ROOT_TABLE_SIZE_INCREMENT;
     AcpiGbl_RootTableList.Flags =
         ACPI_ROOT_ORIGIN_ALLOCATED | ACPI_ROOT_ALLOW_RESIZE;