Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index c11e3795431b..b3e3cc73ba79 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -19,6 +19,7 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <asm/io.h>
+#include <trace/events/power.h>
 
 #include "internal.h"
 #include "sleep.h"
@@ -501,6 +502,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 
         ACPI_FLUSH_CPU_CACHE();
 
+        trace_suspend_resume(TPS("acpi_suspend"), acpi_state, true);
         switch (acpi_state) {
         case ACPI_STATE_S1:
                 barrier();
@@ -516,6 +518,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
                 pr_info(PREFIX "Low-level resume complete\n");
                 break;
         }
+        trace_suspend_resume(TPS("acpi_suspend"), acpi_state, false);
 
         /* This violates the spec but is required for bug compatibility. */
         acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);