forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "ANDROID: sched/fair: add arch scaling function for max frequency capping"

Browse source 
This reverts commit 27ad2abc03.

Upstream has an equivalent feature now, drop the Android-specific
version.

Bug: 120440300
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: If5f89f10cbcd521b095bc2e12f2172349ea512be
This commit is contained in:
Quentin Perret 2020-04-06 16:44:49 +01:00 • committed by Greg Kroah-Hartman
commit 763fae9cfb
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/sched/fair.c
View file

@ -8063,9 +8063,10 @@ static inline void init_sd_lb_stats(struct sd_lb_stats *sds)
};
}
static unsigned long scale_rt_capacity(int cpu, unsigned long max)
static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu)
{
struct rq *rq = cpu_rq(cpu);
unsigned long max = arch_scale_cpu_capacity(cpu);
unsigned long used, free;
unsigned long irq;
@ -8094,15 +8095,10 @@ static unsigned long scale_rt_capacity(int cpu, unsigned long max)
static void update_cpu_capacity(struct sched_domain *sd, int cpu)
{
unsigned long capacity = arch_scale_cpu_capacity(cpu);
unsigned long capacity = scale_rt_capacity(sd, cpu);
struct sched_group *sdg = sd->groups;
cpu_rq(cpu)->cpu_capacity_orig = capacity;
capacity *= arch_scale_max_freq_capacity(sd, cpu);
capacity >>= SCHED_CAPACITY_SHIFT;
capacity = scale_rt_capacity(cpu, capacity);
cpu_rq(cpu)->cpu_capacity_orig = arch_scale_cpu_capacity(cpu);
if (!capacity)
capacity = 1;

9
kernel/sched/sched.h
View file

@ -2024,15 +2024,6 @@ unsigned long arch_scale_freq_capacity(int cpu)
}
#endif
#ifndef arch_scale_max_freq_capacity
struct sched_domain;
static __always_inline
unsigned long arch_scale_max_freq_capacity(struct sched_domain *sd, int cpu)
{
return SCHED_CAPACITY_SCALE;
}
#endif
#ifdef CONFIG_SMP
#ifdef CONFIG_PREEMPTION