diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-12 13:43:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-12 13:43:08 +0200 |
| commit | d715a226b0b3dae48865d05e8c36175a8f75a809 (patch) | |
| tree | 996e45c4075f8e3032daeea8de7bd355fde3cc00 /drivers/acpi | |
| parent | 589e18a973bd6bb8abd2c6d4d8a1dcf5ae1dff61 (diff) | |
| parent | e8bca479c3f269ebb3a3acea5ef63314bb677060 (diff) | |
| download | op-kernel-dev-d715a226b0b3dae48865d05e8c36175a8f75a809.zip op-kernel-dev-d715a226b0b3dae48865d05e8c36175a8f75a809.tar.gz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / sleep: trace events for device PM callbacks
PM / sleep: trace events for suspend/resume
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/sleep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index c11e379..b3e3cc7 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); |
