diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-23 02:15:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-23 02:15:05 +0300 |
| commit | ac80010fc94eb0680d9a432b639583bd7ac29066 (patch) | |
| tree | 2de924c048910abfbfff52a3d5188a790ead379f /drivers/cpufreq/vexpress-spc-cpufreq.c | |
| parent | cfeec3fb5451c2edd0569c0c245868612a417e5f (diff) | |
| parent | c60174717544aa8959683d7e19d568309c3a0c65 (diff) | |
| download | linux-ac80010fc94eb0680d9a432b639583bd7ac29066.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Mere overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/cpufreq/vexpress-spc-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/vexpress-spc-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/vexpress-spc-cpufreq.c b/drivers/cpufreq/vexpress-spc-cpufreq.c index 506e3f2bf53a..83c85d3d67e3 100644 --- a/drivers/cpufreq/vexpress-spc-cpufreq.c +++ b/drivers/cpufreq/vexpress-spc-cpufreq.c @@ -434,7 +434,7 @@ static int ve_spc_cpufreq_init(struct cpufreq_policy *policy) if (cur_cluster < MAX_CLUSTERS) { int cpu; - cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu)); + dev_pm_opp_get_sharing_cpus(cpu_dev, policy->cpus); for_each_cpu(cpu, policy->cpus) per_cpu(physical_cluster, cpu) = cur_cluster; |