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 /kernel/power/hibernate.c | |
| 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 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index df88d55..49e0a20 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -28,6 +28,7 @@ #include <linux/syscore_ops.h> #include <linux/ctype.h> #include <linux/genhd.h> +#include <trace/events/power.h> #include "power.h" @@ -292,7 +293,9 @@ static int create_image(int platform_mode) in_suspend = 1; save_processor_state(); + trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true); error = swsusp_arch_suspend(); + trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false); if (error) printk(KERN_ERR "PM: Error %d creating hibernation image\n", error); |
