summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2016-06-02 12:18:08 +0000
committerAmit Pundir <amit.pundir@linaro.org>2016-09-14 15:17:01 +0530
commit5151bbef1a652dda43f88d8f21c4ccef5022daf2 (patch)
tree666b1a10c1583cd85984f8923db22b9c80c8ef5a /arch/arm
parentfbc1f826a81fd7cb78f2d9a7508379f493038d88 (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>
Diffstat (limited to 'arch/arm')
-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;