summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSaravana Kannan <skannan@codeaurora.org>2015-05-18 08:13:31 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-23 01:49:04 +0300
commit9d16f207112f77711600fb0770182a06e056e5de (patch)
tree967e04e818d6a0bc919d72c764cd57af60dc7b85 /drivers
parent58405af6321a6d69de838f7a2d3115b85c987416 (diff)
downloadlinux-9d16f207112f77711600fb0770182a06e056e5de.tar.xz
cpufreq: Track cpu managing sysfs kobjects separately
In order to prepare for the next few commits, that will stop migrating sysfs files on cpu hotplug, this patch starts managing sysfs-cpu separately. The behavior is still the same as we are still migrating sysfs files on hotplug, later commits would change that. Signed-off-by: Saravana Kannan <skannan@codeaurora.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cpufreq.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 870df9400d3f..5d780ff5a10a 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -959,7 +959,7 @@ static int cpufreq_add_dev_symlink(struct cpufreq_policy *policy)
for_each_cpu(j, policy->cpus) {
struct device *cpu_dev;
- if (j == policy->cpu)
+ if (j == policy->kobj_cpu)
continue;
pr_debug("Adding link for CPU: %u\n", j);
@@ -1178,6 +1178,7 @@ static int update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu,
down_write(&policy->rwsem);
policy->cpu = cpu;
+ policy->kobj_cpu = cpu;
up_write(&policy->rwsem);
return 0;
@@ -1235,10 +1236,12 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
* the creation of a brand new one. So we need to perform this update
* by invoking update_policy_cpu().
*/
- if (recover_policy && cpu != policy->cpu)
+ if (recover_policy && cpu != policy->cpu) {
WARN_ON(update_policy_cpu(policy, cpu, dev));
- else
+ } else {
policy->cpu = cpu;
+ policy->kobj_cpu = cpu;
+ }
cpumask_copy(policy->cpus, cpumask_of(cpu));
@@ -1417,7 +1420,7 @@ static int __cpufreq_remove_dev_prepare(struct device *dev,
CPUFREQ_NAME_LEN);
up_write(&policy->rwsem);
- if (cpu != policy->cpu) {
+ if (cpu != policy->kobj_cpu) {
sysfs_remove_link(&dev->kobj, "cpufreq");
} else if (cpus > 1) {
/* Nominate new CPU */