diff options
| author | Myron Stowe <myron.stowe@hp.com> | 2009-01-30 23:44:53 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-02-07 06:51:23 +0100 |
| commit | 386e4a8358239f90275e1f93d5ad11cdc93c6453 (patch) | |
| tree | b6affdf41cc0ca99e5e61256f2372f240f6fd23f /drivers/acpi | |
| parent | ACPI: Enable bit 11 in _PDC to advertise hw coord (diff) | |
| download | linux-386e4a8358239f90275e1f93d5ad11cdc93c6453.tar.xz linux-386e4a8358239f90275e1f93d5ad11cdc93c6453.zip | |
ACPICA: Fix table entry truncation calculation
During early boot, ACPI RSDT/XSDT table entries are gathered into the
'initial_tables[]' array. This array is currently statically defined (see
./drivers/acpi/tables.c). When there are more table entries than can be
held in the 'initial_tables[]' array, the message "Truncating N table
entries!" is output. As currently implemented, this message will always
erroneously calculate N as 0.
This patch fixes the calculation that determines how many table entries
will be missing (truncated).
This modification may be used under either the GPL or the BSD-style
license used for Intel ACPI CA code.
Signed-off-by: Myron Stowe <myron.stowe@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/tbutils.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c index 9684cc827930..22ce48985720 100644 --- a/drivers/acpi/acpica/tbutils.c +++ b/drivers/acpi/acpica/tbutils.c @@ -538,10 +538,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) if (ACPI_FAILURE(status)) { ACPI_WARNING((AE_INFO, "Truncating %u table entries!", - (unsigned) - (acpi_gbl_root_table_list.size - - acpi_gbl_root_table_list. - count))); + (unsigned) (table_count - + (acpi_gbl_root_table_list. + count - 2)))); break; } } |