summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-27 18:23:59 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-27 18:23:59 +0300
commitf28a1b0df7adcc981e5ce5a5daf3d638dd019c0e (patch)
treead6ec539350520f4f6a81f233bf44bd2bacfe3a3 /drivers
parent584ee3dcb1d6232857c1e38bb28d9f6bf0ec89f5 (diff)
parent9dc17917733f5a53ef970ac95a48d2dfb7dc7202 (diff)
downloadlinux-f28a1b0df7adcc981e5ce5a5daf3d638dd019c0e.tar.xz
Merge branches 'pm-cpufreq' and 'acpi-cppc'
* pm-cpufreq: intel_pstate: Fix "performance" mode behavior with HWP enabled cpufreq: SCPI: Depend on SCPI clk driver cpufreq: intel_pstate: Fix limits->max_perf rounding error cpufreq: intel_pstate: Fix limits->max_policy_pct rounding error cpufreq: Always remove sysfs cpuX/cpufreq link on ->remove_dev() * acpi-cppc: cpufreq: CPPC: Initialize and check CPUFreq CPU co-ord type correctly
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cppc_cpufreq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
index e8cb334094b0..7c0bdfb1a2ca 100644
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@ -98,10 +98,11 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
policy->max = cpu->perf_caps.highest_perf;
policy->cpuinfo.min_freq = policy->min;
policy->cpuinfo.max_freq = policy->max;
+ policy->shared_type = cpu->shared_type;
if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
cpumask_copy(policy->cpus, cpu->shared_cpu_map);
- else {
+ else if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL) {
/* Support only SW_ANY for now. */
pr_debug("Unsupported CPU co-ord type\n");
return -EFAULT;