---

yaml --- r: 223979 b: refs/heads/master c: 938cfed h: refs/heads/master i: 223977: 4d7f382 223975: 92a575f v: v3
git-mirror · Jan 5, 2011 · d0af435 · d0af435
1 parent 528a6c1
commit d0af435
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eccdfe2d245a882feacc4630c9bc29805e9929c8
+refs/heads/master: 938cfed18bec2c7361f37efc954712a7cc42c353
diff --git a/trunk/kernel/power/suspend.c b/trunk/kernel/power/suspend.c
@@ -22,6 +22,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
+#include <trace/events/power.h>
 
 #include "power.h"
 
@@ -201,6 +202,7 @@ int suspend_devices_and_enter(suspend_state_t state)
 	if (!suspend_ops)
 		return -ENOSYS;
 
+	trace_machine_suspend(state);
 	if (suspend_ops->begin) {
 		error = suspend_ops->begin(state);
 		if (error)
@@ -229,6 +231,7 @@ int suspend_devices_and_enter(suspend_state_t state)
  Close:
 	if (suspend_ops->end)
 		suspend_ops->end();
+	trace_machine_suspend(PWR_EVENT_EXIT);
 	return error;
 
  Recover_platform: