svn commit: r206113 - vendor-sys/acpica/dist/tables

[Jung-uk Kim]

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;