diff options
| author | Jean Pihet <j-pihet@ti.com> | 2011-01-05 13:49:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-05 15:25:28 -0500 |
| commit | 938cfed18bec2c7361f37efc954712a7cc42c353 (patch) | |
| tree | 39aa3792d84ae74d7c5cbf7c14779ebe5b221e31 /kernel | |
| parent | eccdfe2d245a882feacc4630c9bc29805e9929c8 (diff) | |
perf: Add calls to suspend trace point
Uses the machine_suspend trace point, called from the
generic kernel suspend_devices_and_enter function.
Signed-off-by: Jean Pihet <j-pihet@ti.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Arjan van de Ven <arjan@linux.intel.com>
CC: Thomas Renninger <trenn@suse.de>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: linux-pm@lists.linux-foundation.org
LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@ti.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/suspend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index ecf770509d0d..031d5e3a6197 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/suspend.h> | 24 | #include <linux/suspend.h> |
| 25 | #include <trace/events/power.h> | ||
| 25 | 26 | ||
| 26 | #include "power.h" | 27 | #include "power.h" |
| 27 | 28 | ||
| @@ -201,6 +202,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 201 | if (!suspend_ops) | 202 | if (!suspend_ops) |
| 202 | return -ENOSYS; | 203 | return -ENOSYS; |
| 203 | 204 | ||
| 205 | trace_machine_suspend(state); | ||
| 204 | if (suspend_ops->begin) { | 206 | if (suspend_ops->begin) { |
| 205 | error = suspend_ops->begin(state); | 207 | error = suspend_ops->begin(state); |
| 206 | if (error) | 208 | if (error) |
| @@ -229,6 +231,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
| 229 | Close: | 231 | Close: |
| 230 | if (suspend_ops->end) | 232 | if (suspend_ops->end) |
| 231 | suspend_ops->end(); | 233 | suspend_ops->end(); |
| 234 | trace_machine_suspend(PWR_EVENT_EXIT); | ||
| 232 | return error; | 235 | return error; |
| 233 | 236 | ||
| 234 | Recover_platform: | 237 | Recover_platform: |
