From patchwork Wed Oct 27 00:00:56 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Thomas Renninger <trenn@suse.de>
X-Patchwork-Id: 284362
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9R01AM0024098
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 27 Oct 2010 00:01:12 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1760562Ab0J0AA5 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Tue, 26 Oct 2010 20:00:57 -0400
Received: from cantor.suse.de ([195.135.220.2]:49393 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1760558Ab0J0AAz (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Tue, 26 Oct 2010 20:00:55 -0400
Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.suse.de (Postfix) with ESMTP id 6822D93F46;
	Wed, 27 Oct 2010 02:00:54 +0200 (CEST)
From: Thomas Renninger <trenn@suse.de>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: [PATCH] PERF(kernel): Cleanup power events V2
Date: Wed, 27 Oct 2010 02:00:56 +0200
User-Agent: KMail/1.9.10
Cc: Ingo Molnar <mingo@elte.hu>, Jean Pihet <jean.pihet@newoldbits.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Frank Eigler <fche@redhat.com>, Steven Rostedt <rostedt@goodmis.org>,
	Kevin Hilman <khilman@deeprootsystems.com>,
	Peter Zijlstra <peterz@infradead.org>, linux-omap@vger.kernel.org,
	linux-pm@lists.linux-foundation.org, linux-trace-users@vger.kernel.org,
	Pierre Tardy <tardyp@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>, Tejun Heo <tj@kernel.org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Arjan van de Ven <arjan@linux.intel.com>
References: <1287488171-25303-3-git-send-email-trenn@suse.de>
	<201010261348.49240.trenn@suse.de>
	<201010262057.02218.rjw@sisk.pl>
In-Reply-To: <201010262057.02218.rjw@sisk.pl>
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <201010270200.57748.trenn@suse.de>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Wed, 27 Oct 2010 00:01:12 +0000 (UTC)


diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 7335952..10cad5c 100644
--- a/kernel/power/suspend.c
+++ b/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"
 
@@ -164,7 +165,9 @@ static int suspend_enter(suspend_state_t state)
        error = sysdev_suspend(PMSG_SUSPEND);
        if (!error) {
                if (!suspend_test(TEST_CORE) && pm_check_wakeup_events()) {
+                       trace_machine_suspend(state);
                        error = suspend_ops->enter(state);
+                       trace_machine_suspend(0);
                        events_check_enabled = false;
                }
                sysdev_resume();