From bcfd420191d3d1bbc2c8af8bedf088f90c67f44d Mon Sep 17 00:00:00 2001 From: Dirk Brandewie Date: Tue, 7 May 2013 08:20:27 -0700 Subject: [PATCH] --- yaml --- r: 375699 b: refs/heads/master c: ca182aee389f8026401510f4c63841cb02c820e8 h: refs/heads/master i: 375697: 682d803a3e76d6d23ef4b0e4ac07d105f28141a5 375695: bd198f2bce3db2bb463e161f2c0e5a57d946677a v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/intel_pstate.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6178caf586a1..00430c8d9e0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8f469e9cff3bc4a6317d923e9506be046aa7bdc +refs/heads/master: ca182aee389f8026401510f4c63841cb02c820e8 diff --git a/trunk/drivers/cpufreq/intel_pstate.c b/trunk/drivers/cpufreq/intel_pstate.c index 4a437ffc5186..a7f1946b3452 100644 --- a/trunk/drivers/cpufreq/intel_pstate.c +++ b/trunk/drivers/cpufreq/intel_pstate.c @@ -551,22 +551,16 @@ static void intel_pstate_timer_func(unsigned long __data) struct cpudata *cpu = (struct cpudata *) __data; intel_pstate_sample(cpu); + intel_pstate_adjust_busy_pstate(cpu); - if (!cpu->idle_mode) - intel_pstate_adjust_busy_pstate(cpu); - else - intel_pstate_adjust_idle_pstate(cpu); - -#if defined(XPERF_FIX) if (cpu->pstate.current_pstate == cpu->pstate.min_pstate) { cpu->min_pstate_count++; if (!(cpu->min_pstate_count % 5)) { intel_pstate_set_pstate(cpu, cpu->pstate.max_pstate); - intel_pstate_idle_mode(cpu); } } else cpu->min_pstate_count = 0; -#endif + intel_pstate_set_sample_time(cpu); }