Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58fac225 authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

DEBUG: cpufreq: fix cpu_capacity tracing build for non-smp systems 



cpu curr capacity can only be traced for SMP systems. Non-SMP builds
will fail with:

drivers/cpufreq/cpufreq.c: In function ‘cpufreq_freq_transition_begin’:
drivers/cpufreq/cpufreq.c:438:22: error: implicit declaration of function ‘capacity_curr_of’ [-Werror=implicit-function-declaration]
   trace_cpu_capacity(capacity_curr_of(cpu), cpu);
                      ^

Fixes: Change-Id: Icd0930d11068fcb7d2b6a9a48e7ed974904e1081
       ("DEBUG: sched,cpufreq: add cpu_capacity change tracepoint")
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent d6a9a744

drivers/cpufreq/cpufreq.c

+6 −0
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ 
#include <linux/slab.h>

#include <linux/suspend.h>

#include <linux/tick.h>

#ifdef CONFIG_SMP

#include <linux/sched.h>

#endif

#include <trace/events/power.h>



/**
@@ -405,7 +407,9 @@ static void cpufreq_notify_post_transition(struct cpufreq_policy *policy, 
void cpufreq_freq_transition_begin(struct cpufreq_policy *policy,

		struct cpufreq_freqs *freqs)

{

#ifdef CONFIG_SMP

	int cpu;

#endif



	/*

	 * Catch double invocations of _begin() which lead to self-deadlock.
@@ -434,8 +438,10 @@ wait: 
	spin_unlock(&policy->transition_lock);



	scale_freq_capacity(policy, freqs);

#ifdef CONFIG_SMP

	for_each_cpu(cpu, policy->cpus)

		trace_cpu_capacity(capacity_curr_of(cpu), cpu);

#endif



	cpufreq_notify_transition(policy, freqs, CPUFREQ_PRECHANGE);

}