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>
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 870df94..5d780ff 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -959,7 +959,7 @@
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 @@
down_write(&policy->rwsem);
policy->cpu = cpu;
+ policy->kobj_cpu = cpu;
up_write(&policy->rwsem);
return 0;
@@ -1235,10 +1236,12 @@
* 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 @@
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 */