aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2014-02-07 20:42:07 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-10 18:30:24 -0500
commit2e19f8d02ee7acd939d60a89905c6fbc27c7cfab (patch)
tree4f1adae6fcd05b5d6fd61cc535b5fdb7376d1895
parentc03775c0827f4d10fcb360c9b8af9a922aedaf4b (diff)
ACPICA: Deploy new 32/64 printf support for table override mechanism.
Similar to the earlier tbprint.c change. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/tbinstal.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 634357d51fe9..c1a8cf7ae0f9 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -292,10 +292,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
292 new_table = acpi_os_map_memory(new_address, new_table_length); 292 new_table = acpi_os_map_memory(new_address, new_table_length);
293 if (!new_table) { 293 if (!new_table) {
294 ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, 294 ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
295 "%4.4s %p Attempted physical table override failed", 295 "%4.4s " ACPI_PRINTF_UINT
296 " Attempted physical table override failed",
296 table_header->signature, 297 table_header->signature,
297 ACPI_CAST_PTR(void, 298 ACPI_FORMAT_TO_UINT(table_desc->
298 table_desc->address))); 299 address)));
299 return (NULL); 300 return (NULL);
300 } 301 }
301 302
@@ -308,11 +309,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
308 309
309finish_override: 310finish_override:
310 311
311 ACPI_INFO((AE_INFO, 312 ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
312 "%4.4s %p %s table override, new table: %p", 313 " %s table override, new table: " ACPI_PRINTF_UINT,
313 table_header->signature, 314 table_header->signature,
314 ACPI_CAST_PTR(void, table_desc->address), 315 ACPI_FORMAT_TO_UINT(table_desc->address),
315 override_type, new_table)); 316 override_type, ACPI_FORMAT_TO_UINT(new_table)));
316 317
317 /* We can now unmap/delete the original table (if fully mapped) */ 318 /* We can now unmap/delete the original table (if fully mapped) */
318 319