diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 9fe681e4ff09..63c1e76739f1 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -17,8 +17,6 @@ #include DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE; -DEFINE_PER_CPU(unsigned long, max_cpu_freq); -DEFINE_PER_CPU(unsigned long, max_freq_scale) = SCHED_CAPACITY_SCALE; void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, unsigned long max_freq) @@ -28,29 +26,8 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq; - for_each_cpu(i, cpus) { + for_each_cpu(i, cpus) per_cpu(freq_scale, i) = scale; - per_cpu(max_cpu_freq, i) = max_freq; - } -} - -void arch_set_max_freq_scale(struct cpumask *cpus, - unsigned long policy_max_freq) -{ - unsigned long scale, max_freq; - int cpu = cpumask_first(cpus); - - if (cpu > nr_cpu_ids) - return; - - max_freq = per_cpu(max_cpu_freq, cpu); - if (!max_freq) - return; - - scale = (policy_max_freq << SCHED_CAPACITY_SHIFT) / max_freq; - - for_each_cpu(cpu, cpus) - per_cpu(max_freq_scale, cpu) = scale; } DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 3a2d3da10258..642fc08b6c82 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -153,12 +153,6 @@ __weak void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, } EXPORT_SYMBOL_GPL(arch_set_freq_scale); -__weak void arch_set_max_freq_scale(struct cpumask *cpus, - unsigned long policy_max_freq) -{ -} -EXPORT_SYMBOL_GPL(arch_set_max_freq_scale); - /* * This is a generic cpufreq init() routine which can be used by cpufreq * drivers of SMP systems. It will do following: @@ -2422,8 +2416,6 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, policy->max = new_policy->max; trace_cpu_frequency_limits(policy); - arch_set_max_freq_scale(policy->cpus, policy->max); - policy->cached_target_freq = UINT_MAX; pr_debug("new min and max freqs are %u - %u kHz\n", diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 3208e8256763..1cfe05ea1d89 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -33,12 +33,4 @@ unsigned long topology_get_freq_scale(int cpu) return per_cpu(freq_scale, cpu); } -DECLARE_PER_CPU(unsigned long, max_freq_scale); - -static inline -unsigned long topology_get_max_freq_scale(struct sched_domain *sd, int cpu) -{ - return per_cpu(max_freq_scale, cpu); -} - #endif /* _LINUX_ARCH_TOPOLOGY_H_ */ diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 66bebf55de45..536a049d7ecc 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -984,8 +984,6 @@ extern unsigned int arch_freq_get_on_cpu(int cpu); extern void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, unsigned long max_freq); -extern void arch_set_max_freq_scale(struct cpumask *cpus, - unsigned long policy_max_freq); /* the following are really really optional */ extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;