From d0af4358bbd8d6353ec0fb0051b8d3ebd1c36386 Mon Sep 17 00:00:00 2001
From: Jean Pihet <j-pihet@ti.com>
Date: Wed, 5 Jan 2011 19:49:01 +0100
Subject: [PATCH] --- yaml --- r: 223979 b: refs/heads/master c:
 938cfed18bec2c7361f37efc954712a7cc42c353 h: refs/heads/master i:   223977:
 4d7f382cd81b0af4a4b56f88c65788f410aff17f   223975:
 92a575f852ddf1499708b92ef573af028c38194a v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/power/suspend.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b3aa2b86b1a..f99cfb921e19 100644
--- 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
index ecf770509d0d..031d5e3a6197 100644
--- 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: