@@ -49,7 +49,6 @@ struct cpufreq_interactive_cpuinfo {
u64 target_set_time;
u64 target_set_time_in_idle;
u64 target_validate_time;
- u64 target_validate_time_in_idle;
struct cpufreq_policy *policy;
struct cpufreq_frequency_table *freq_table;
unsigned int target_freq;
@@ -236,7 +235,6 @@ static void cpufreq_interactive_timer(unsigned long data)
}
}
- pcpu->target_validate_time_in_idle = now_idle;
pcpu->target_validate_time = pcpu->timer_run_time;
if (pcpu->target_freq == new_freq) {
@@ -510,8 +508,7 @@ static void cpufreq_interactive_boost(void)
* allowing speed to drop).
*/
- pcpu->target_validate_time_in_idle =
- get_cpu_idle_time_us(i, &pcpu->target_validate_time);
+ pcpu->target_validate_time = ktime_to_us(ktime_get());
}
spin_unlock_irqrestore(&up_cpumask_lock, flags);
@@ -776,8 +773,6 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
&pcpu->target_set_time);
pcpu->target_validate_time =
pcpu->target_set_time;
- pcpu->target_validate_time_in_idle =
- pcpu->target_set_time_in_idle;
pcpu->governor_enabled = 1;
smp_wmb();
}