diff options
| author | Juri Lelli <juri.lelli@arm.com> | 2015-11-10 16:15:18 +0000 |
|---|---|---|
| committer | Juri Lelli <juri.lelli@arm.com> | 2015-11-10 16:23:16 +0000 |
| commit | a975509f7aa00162333b9cb2bc371c4d95fa2484 (patch) | |
| tree | fef3dee4869ee080b3e49aec39c5bdb552a5959b | |
| parent | d47adb96ef6311d77b15eda46c96eca31e10bc19 (diff) | |
arm, arm64: guard arm_arch_scale_freq_capacity with CONFIG_CPU_FREQ
When !CONFIG_CPU_FREQ arm_arch_scale_freq_capacity can simply return
SCHED_CAPACITY_SCALE.
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
| -rw-r--r-- | arch/arm/kernel/topology.c | 7 | ||||
| -rw-r--r-- | arch/arm64/kernel/topology.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index d825c024a674..c2b724f770d6 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -151,6 +151,7 @@ static void update_cpu_capacity(unsigned int cpu) cpu, arch_scale_cpu_capacity(NULL, cpu)); } +#ifdef CONFIG_CPU_FREQ /* * Scheduler load-tracking scale-invariance * @@ -167,6 +168,12 @@ unsigned long arm_arch_scale_freq_capacity(int cpu) return curr; } +#else /* CONFIG_CPU_FREQ */ +unsigned long arm_arch_scale_freq_capacity(int cpu) +{ + return SCHED_CAPACITY_SCALE; +} +#endif /* CONFIG_CPU_FREQ */ #else static inline void parse_dt_topology(void) {} diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index ccb749e8b211..189235310dfb 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -214,6 +214,7 @@ out: return ret; } +#ifdef CONFIG_CPU_FREQ /* * Scheduler load-tracking scale-invariance * @@ -230,6 +231,12 @@ unsigned long arm_arch_scale_freq_capacity(int cpu) return curr; } +#else /* CONFIG_CPU_FREQ */ +unsigned long arm_arch_scale_freq_capacity(int cpu) +{ + return SCHED_CAPACITY_SCALE; +} +#endif /* CONFIG_CPU_FREQ */ /* * cpu topology table |