From 3f27035eb833695cd3642d0ff393aefe9a6e1061 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Thu, 1 Feb 2018 15:39:17 +0000 Subject: [PATCH] Revert "ANDROID: arm64: Enable max freq invariant scheduler load-tracking and capacity support" This reverts commit 8f4855421f616a186fa6bbfccaaf8a1056fa9df1. Change-Id: Icddb9545030e81b2a8861e3acb44192a890c8e0f Signed-off-by: Quentin Perret --- arch/arm64/include/asm/topology.h | 1 - arch/arm64/kernel/topology.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 7ec84d0191c8..237eaa0d5cf7 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -35,7 +35,6 @@ struct sched_domain; #ifdef CONFIG_CPU_FREQ #define arch_scale_freq_capacity cpufreq_scale_freq_capacity extern unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu); -extern unsigned long cpufreq_scale_max_freq_capacity(int cpu); #endif #define arch_scale_cpu_capacity scale_cpu_capacity extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu); diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 7758f7ff131b..ed734264a516 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -29,13 +29,7 @@ static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu) { -#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; -#else return per_cpu(cpu_scale, cpu); -#endif } static void set_capacity_scale(unsigned int cpu, unsigned long capacity)