public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Thomas Renninger <trenn@suse.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	jean.pihet@newoldbits.com, arjan@linux.intel.com, j-pihet@ti.com,
	tglx@linutronix.de, trenn@suse.de, mingo@elte.hu
Subject: [tip:perf/core] perf: Do not export power_frequency, but power_start event
Date: Tue, 4 Jan 2011 08:26:31 GMT	[thread overview]
Message-ID: <tip-61a0d49c33c7fd57c14895e5b0760bd02b65ac1f@git.kernel.org> (raw)
In-Reply-To: <1290072314-31155-2-git-send-email-trenn@suse.de>

Commit-ID:  61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Gitweb:     http://git.kernel.org/tip/61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Author:     Thomas Renninger <trenn@suse.de>
AuthorDate: Mon, 3 Jan 2011 17:50:43 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 4 Jan 2011 08:16:54 +0100

perf: Do not export power_frequency, but power_start event

power_frequency moved to drivers/cpufreq/cpufreq.c which has
to be compiled in, no need to export it.

intel_idle can a be module though...

Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jean Pihet <jean.pihet@newoldbits.com>
Cc: Jean Pihet <j-pihet@ti.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: rjw@sisk.pl
LKML-Reference: <1294073445-14812-2-git-send-email-trenn@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de>
---
 drivers/idle/intel_idle.c   |    2 --
 kernel/trace/power-traces.c |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index c131d58..15783d5 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -220,9 +220,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);
 

  parent reply	other threads:[~2011-01-04  8:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1290072314-31155-1-git-send-email-trenn@suse.de>
2010-11-18  9:25 ` [PATCH 1/3] PERF: Do not export power_frequency, but power_start event Thomas Renninger
2010-11-18  9:44   ` Jean Pihet
2011-01-04  8:26   ` tip-bot for Thomas Renninger [this message]
2011-01-04  8:27   ` [tip:perf/core] perf: Clean up power events by introducing new, more generic ones tip-bot for Thomas Renninger
     [not found] ` <1290072314-31155-4-git-send-email-trenn@suse.de>
2010-11-18  9:34   ` [PATCH 3/3] PERF(userspace): Adjust perf timechart to the new power events Ingo Molnar
     [not found] <1294073445-14812-1-git-send-email-trenn@suse.de>
2011-01-03 16:50 ` [PATCH 1/3] perf: Do not export power_frequency, but power_start event Thomas Renninger
2011-01-03 16:50 ` [PATCH 2/3] perf: Clean up power events Thomas Renninger
2011-01-04  7:11   ` Ingo Molnar
2011-01-03 16:50 ` [PATCH 3/3] PERF(userspace): Adjust perf timechart to the new " Thomas Renninger
2011-01-04  8:27   ` [tip:perf/core] perf timechart: " tip-bot for Thomas Renninger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-61a0d49c33c7fd57c14895e5b0760bd02b65ac1f@git.kernel.org \
    --to=trenn@suse.de \
    --cc=arjan@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=j-pihet@ti.com \
    --cc=jean.pihet@newoldbits.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox