aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2016-08-29 19:48:17 +0530
committerAmit Pundir <amit.pundir@linaro.org>2016-08-30 11:53:59 +0530
commitae3fb5fc3e450d3840a085e273ecee96523ccb2a (patch)
tree197e4082683e02f41050ffc1402138150ebaf7e3
parenta5623ec5dae13b485bdbff16e4b82d4a00a0e99d (diff)
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: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--drivers/cpufreq/cpufreq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 2154fcc1e60a..d390ebbcec39 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -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);
}