From: Todd Poynor <[email protected]>

Change-Id: I37c5085b91318242612440dfd775ad762996612f
Signed-off-by: Todd Poynor <[email protected]>
Signed-off-by: Bálint Czobor <[email protected]>
---
 drivers/cpufreq/cpufreq_interactive.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/cpufreq/cpufreq_interactive.c 
b/drivers/cpufreq/cpufreq_interactive.c
index 1387cd5..90db2c3 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -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();
                }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to