Merge branch 'acpica'

* acpica: (29 commits)
  ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."
  ACPICA: Update version to 20140214.
  ACPICA: Prevent infinite loops when traversing corrupted lists.
  ACPICA: Debugger: Add missing objects; Traverse linked lists
  ACPICA: Add text: ACPICA policy for new _OSI strings. No functional change.
  ACPICA: Update for _PRP predefined name.
  ACPICA: Cleanup/improve global variable declarations.
  ACPICA: Comment update - no functional change.
  ACPICA: Do not abort _PRT repair on a single subpackage failure.
  ACPICA: Harden _PRT repair code; check for minimum package length.
  ACPICA: Restore code that repairs NULL package elements in return values.
  ACPICA: Properly handle NULL entries in _PRT return packages.
  ACPICA: Update conditional compilation flags for resource dump functions.
  ACPICA: Predefined names: Add support for the _PRP method.
  ACPICA: Headers: Deploy #pragma pack (push) and (pop).
  ACPICA: Add boot option to disable auto return object repair
  ACPICA: acpidump: Remove integer types translation protection.
  ACPICA: acpidump: Add sparse declarators support.
  ACPICA: Add "Windows 2013" string to _OSI support.
  ACPICA: Update version to 20140114.
  ...

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 634357d51fe9..e3040947e9a0 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -292,10 +292,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
                 new_table = acpi_os_map_memory(new_address, new_table_length);
                 if (!new_table) {
                         ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
-                                        "%4.4s %p Attempted physical table override failed",
+                                        "%4.4s " ACPI_PRINTF_UINT
+                                        " Attempted physical table override failed",
                                         table_header->signature,
-                                        ACPI_CAST_PTR(void,
-                                                      table_desc->address)));
+                                        ACPI_FORMAT_TO_UINT(table_desc->
+                                                            address)));
                         return (NULL);
                 }
 
@@ -308,11 +309,11 @@ struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
 
 finish_override:
 
-        ACPI_INFO((AE_INFO,
-                   "%4.4s %p %s table override, new table: %p",
+        ACPI_INFO((AE_INFO, "%4.4s " ACPI_PRINTF_UINT
+                   " %s table override, new table: " ACPI_PRINTF_UINT,
                    table_header->signature,
-                   ACPI_CAST_PTR(void, table_desc->address),
-                   override_type, new_table));
+                   ACPI_FORMAT_TO_UINT(table_desc->address),
+                   override_type, ACPI_FORMAT_TO_UINT(new_table)));
 
         /* We can now unmap/delete the original table (if fully mapped) */