2010-11-18 09:25:22

by Thomas Renninger

Subject: [PATCH 1/3] 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 <[email protected]>
CC: Jean Pihet <[email protected]>
CC: Arjan van de Ven <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: [email protected]
---
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 41665d2..3c95325 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);

--
1.6.3

2010-11-18 09:49:46

by Jean Pihet

Subject: Re: [PATCH 1/3] PERF: Do not export power_frequency, but power_start event

On Thu, Nov 18, 2010 at 10:25 AM, Thomas Renninger <[email protected]> wrote:
> 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 <[email protected]>
> CC: Jean Pihet <[email protected]>
> CC: Arjan van de Ven <[email protected]>
> CC: Ingo Molnar <[email protected]>
> CC: [email protected]

Ok for me!

Acked-by: Jean Pihet <[email protected]>

Note the ti.com email address to be used for Sign-offs and Acks.

> ---
> ?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 41665d2..3c95325 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);
>
> --
> 1.6.3
>
>

Thanks,
Jean