summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2016-06-02 12:18:08 +0000
committerJohn Stultz <john.stultz@linaro.org>2016-09-09 15:55:43 -0700
commit23eeab46c8550123a5e66b7b11862118dbb05d69 (patch)
treea9fd0808f7de33da1c96648a9d4a6efbff847d62
parentad607cd620b8caeebf3ed3336fa80921c588b27f (diff)
arm: Fix #if/#ifdef typo in topology.c
Probably a typo in arch/arm/kernel/topology.c This patch fixes the warning... arch/arm/kernel/topology.c: In function 'scale_cpu_capacity': arch/arm/kernel/topology.c:47:5: warning: "CONFIG_CPU_FREQ" is not defined [-Wundef] Fixes: Change-Id: If5e9e0ba8ff5a5d3236b373dbce8c72ea71b5e18 ("arm: Enable max freq invariant scheduler load-tracking and capacity support") Signed-off-by: Jon Medhurst <tixy@linaro.org> Signed-off-by: Amit Pundir <amit.pundir@linaro.org> [jstultz: Cherry-picked from android-3.18] Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--arch/arm/kernel/topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index f5941004efba..4f2c51ef162d 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -44,7 +44,7 @@ static DEFINE_PER_CPU(unsigned long, cpu_scale);
unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu)
{
-#if CONFIG_CPU_FREQ
+#ifdef CONFIG_CPU_FREQ
unsigned long max_freq_scale = cpufreq_scale_max_freq_capacity(cpu);
return per_cpu(cpu_scale, cpu) * max_freq_scale >> SCHED_CAPACITY_SHIFT;