aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-04-02 21:05:28 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-04-02 21:05:28 +0000
commit9a8b5e6355e39ba0602a7f9484dca40f429fe6b0 (patch)
tree7dba1d9f79e99190c2c6753090a3cd0bd85d8307
parent28d6b3182d209b2a1385429a55f21fa8c79e6620 (diff)
downloadsrc-9a8b5e6355e39ba0602a7f9484dca40f429fe6b0.tar.gz
src-9a8b5e6355e39ba0602a7f9484dca40f429fe6b0.zip
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
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=206113
-rw-r--r--tables/tbxface.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/tables/tbxface.c b/tables/tbxface.c
index ba0ec0f7b255..b3e09a0271f6 100644
--- a/tables/tbxface.c
+++ b/tables/tbxface.c
@@ -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;