From patchwork Tue Oct 19 11:36:09 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: 265491
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 o9JBaHTh002983
	for <patchwork-omap@patchwork.kernel.org>;
	Tue, 19 Oct 2010 11:36:18 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758487Ab0JSLgQ (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Tue, 19 Oct 2010 07:36:16 -0400
Received: from cantor2.suse.de ([195.135.220.15]:59346 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758460Ab0JSLgO (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Tue, 19 Oct 2010 07:36:14 -0400
Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2])
	by mx2.suse.de (Postfix) with ESMTP id 351E58655F;
	Tue, 19 Oct 2010 13:36:12 +0200 (CEST)
From: Thomas Renninger <trenn@suse.de>
To: trenn@suse.de
Cc: 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,
	rjw@sisk.pl, linux-pm@lists.linux-foundation.org,
	linux-trace-users@vger.kernel.org,
	Jean Pihet <jean.pihet@newoldbits.com>, 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>, Ingo Molnar <mingo@elte.hu>
Subject: [PATCH 1/3] PERF: Do not export power_frequency,
	but power_start event
Date: Tue, 19 Oct 2010 13:36:09 +0200
Message-Id: <1287488171-25303-2-git-send-email-trenn@suse.de>
X-Mailer: git-send-email 1.6.0.2
In-Reply-To: <1287488171-25303-1-git-send-email-trenn@suse.de>
References: <1287488171-25303-1-git-send-email-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]);
	Tue, 19 Oct 2010 11:36:18 +0000 (UTC)


diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index c37ef64..21ac077 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -201,9 +201,7 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
 	kt_before = ktime_get_real();
 
 	stop_critical_timings();
-#ifndef MODULE
 	trace_power_start(POWER_CSTATE, (eax >> 4) + 1, cpu);
-#endif
 	if (!need_resched()) {
 
 		__monitor((void *)&current_thread_info()->flags, 0, 0);
diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c
index a22582a..0e0497d 100644
--- a/kernel/trace/power-traces.c
+++ b/kernel/trace/power-traces.c
@@ -13,5 +13,5 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/power.h>
 
-EXPORT_TRACEPOINT_SYMBOL_GPL(power_frequency);
+EXPORT_TRACEPOINT_SYMBOL_GPL(power_start);