Merge branch 'acpica'

* acpica:
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index 4cfc3d3b5c97..6fbfad47518c 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -75,6 +75,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
                         u32 level, u32 index)
 {
         u32 i;
+        u32 timer;
 
         ACPI_FUNCTION_TRACE_PTR(ex_do_debug_object, source_desc);
 
@@ -86,11 +87,19 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
         }
 
         /*
+         * We will emit the current timer value (in microseconds) with each
+         * debug output. Only need the lower 26 bits. This allows for 67
+         * million microseconds or 67 seconds before rollover.
+         */
+        timer = ((u32)acpi_os_get_timer() / 10);        /* (100 nanoseconds to microseconds) */
+        timer &= 0x03FFFFFF;
+
+        /*
          * Print line header as long as we are not in the middle of an
          * object display
          */
         if (!((level > 0) && index == 0)) {
-                acpi_os_printf("[ACPI Debug] %*s", level, " ");
+                acpi_os_printf("[ACPI Debug %.8u] %*s", timer, level, " ");
         }
 
         /* Display the index for package output only */