Merge "cpufreq: interactive: Revert sync on thread migration optimizations"

This commit is contained in:
Linux Build Service Account 2014-08-18 10:49:26 -07:00 committed by Gerrit - the friendly Code Review server
commit bc99d06aaa

View file

@ -55,7 +55,6 @@ struct cpufreq_interactive_cpuinfo {
struct rw_semaphore enable_sem;
int governor_enabled;
int prev_load;
bool limits_changed;
};
static DEFINE_PER_CPU(struct cpufreq_interactive_cpuinfo, cpuinfo);
@ -459,14 +458,6 @@ static void cpufreq_interactive_timer(unsigned long data)
else
mod_min_sample_time = tunables->min_sample_time;
if (pcpu->limits_changed) {
if (tunables->sampling_down_factor &&
(pcpu->policy->cur != pcpu->policy->max))
mod_min_sample_time = 0;
pcpu->limits_changed = false;
}
if (new_freq < pcpu->floor_freq) {
if (now - pcpu->floor_validate_time < mod_min_sample_time) {
trace_cpufreq_interactive_notyet(
@ -1450,7 +1441,6 @@ static int cpufreq_governor_interactive(struct cpufreq_policy *policy,
}
pcpu->max_freq = policy->max;
pcpu->limits_changed = true;
}
break;
}