aboutsummaryrefslogtreecommitdiff
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-11-13 12:06:30 +0000
committerMark Brown <broonie@linaro.org>2013-11-13 12:06:30 +0000
commit54a3a4d441e9eaceb86989f0b466e77815ab6129 (patch)
treeeab08ab86a34f0a071467435b42f733d1af013cf /drivers/cpufreq
parent7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff)
parent3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff)
downloadlinaro-lsk-54a3a4d441e9eaceb86989f0b466e77815ab6129.tar.gz
Merge tag 'v3.10.19' into linux-linaro-lsk
This is the 3.10.19 stable release
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/intel_pstate.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 6d6a0b48eb7..9520e3b90bd 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -629,8 +629,8 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
{
- int rc, min_pstate, max_pstate;
struct cpudata *cpu;
+ int rc;
rc = intel_pstate_init_cpu(policy->cpu);
if (rc)
@@ -644,9 +644,8 @@ static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
else
policy->policy = CPUFREQ_POLICY_POWERSAVE;
- intel_pstate_get_min_max(cpu, &min_pstate, &max_pstate);
- policy->min = min_pstate * 100000;
- policy->max = max_pstate * 100000;
+ policy->min = cpu->pstate.min_pstate * 100000;
+ policy->max = cpu->pstate.turbo_pstate * 100000;
/* cpuinfo and default policy values */
policy->cpuinfo.min_freq = cpu->pstate.min_pstate * 100000;