arch_scale_freq_capacityschedutil-v3-enhancements-plus

4 files changed, 0 insertions, 44 deletions

diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index 1b8902cf6b2a8c..8b7347e2b76396 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -24,13 +24,7 @@ void init_cpu_topology(void);
 void store_cpu_topology(unsigned int cpuid);
 const struct cpumask *cpu_coregroup_mask(int cpu);
 
-#define arch_scale_freq_capacity arm_arch_scale_freq_capacity
 struct sched_domain;
-extern
-unsigned long arm_arch_scale_freq_capacity(struct sched_domain *sd, int cpu);
-
-DECLARE_PER_CPU(atomic_long_t, cpu_freq_capacity);
-
 #define arch_scale_cpu_capacity arm_arch_scale_cpu_capacity
 extern
 unsigned long arm_arch_scale_cpu_capacity(struct sched_domain *sd, int cpu);
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index bbe20c7bb01632..d2431cf1f2c4cb 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -151,23 +151,6 @@ static void update_cpu_capacity(unsigned int cpu)
 		cpu, arch_scale_cpu_capacity(NULL, cpu));
 }
 
-/*
- * Scheduler load-tracking scale-invariance
- *
- * Provides the scheduler with a scale-invariance correction factor that
- * compensates for frequency scaling (arch_scale_freq_capacity()). The scaling
- * factor is updated in smp.c
- */
-unsigned long arm_arch_scale_freq_capacity(struct sched_domain *sd, int cpu)
-{
-	unsigned long curr = atomic_long_read(&per_cpu(cpu_freq_capacity, cpu));
-
-	if (!curr)
-		return SCHED_CAPACITY_SCALE;
-
-	return curr;
-}
-
 #else
 static inline void parse_dt_topology(void) {}
 static inline void update_cpu_capacity(unsigned int cpuid) {}
diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index e183b9f75792d5..75f51aa2f59b84 100644
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -18,7 +18,6 @@ extern struct cpu_topology cpu_topology[NR_CPUS];
 #define topology_core_cpumask(cpu)	(&cpu_topology[cpu].core_sibling)
 #define topology_sibling_cpumask(cpu)	(&cpu_topology[cpu].thread_sibling)
 
-#define arch_scale_cpu_capacity arm_arch_scale_cpu_capacity
 extern
 unsigned long arm_arch_scale_cpu_capacity(struct sched_domain *sd, int cpu);
 
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 4b30727ff2b6c5..a926971a474a66 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -24,8 +24,6 @@
 #include <asm/cputype.h>
 #include <asm/topology.h>
 
-<<<<<<< HEAD
-=======
 /*
  * cpu capacity scale management
  */
@@ -151,24 +149,6 @@ static void update_cpu_capacity(unsigned int cpu)
 		cpu, arch_scale_cpu_capacity(NULL, cpu));
 }
 
-/*
- * Scheduler load-tracking scale-invariance
- *
- * Provides the scheduler with a scale-invariance correction factor that
- * compensates for frequency scaling (arch_scale_freq_capacity()). The scaling
- * factor is updated in smp.c
- */
-unsigned long arm_arch_scale_freq_capacity(struct sched_domain *sd, int cpu)
-{
-	unsigned long curr = atomic_long_read(&per_cpu(cpu_freq_capacity, cpu));
-
-	if (!curr)
-		return SCHED_CAPACITY_SCALE;
-
-	return curr;
-}
-
->>>>>>> be7ea4daf206... arm64: Add cpu capacity scale management for load-tracking
 static int __init get_cpu_for_node(struct device_node *node)
 {
 	struct device_node *cpu_node;