Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / drivers / cpufreq / cpufreq.c

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 26b643d57847de0fca4afc099f4bec49d6326be9..29c5b0cbad967ecc3ef0cd8d6c34bc6d88131c2c 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -887,7 +887,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
        struct freq_attr *fattr = to_attr(attr);
        ssize_t ret = -EINVAL;
 
-       get_online_cpus();
+       cpus_read_lock();
 
        if (cpu_online(policy->cpu)) {
                down_write(&policy->rwsem);
@@ -895,7 +895,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
                up_write(&policy->rwsem);
        }
 
-       put_online_cpus();
+       cpus_read_unlock();
 
        return ret;
 }
@@ -2441,7 +2441,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
        pr_debug("trying to register driver %s\n", driver_data->name);
 
        /* Protect against concurrent CPU online/offline. */
-       get_online_cpus();
+       cpus_read_lock();
 
        write_lock_irqsave(&cpufreq_driver_lock, flags);
        if (cpufreq_driver) {
@@ -2474,9 +2474,10 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
                goto err_if_unreg;
        }
 
-       ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "cpufreq:online",
-                                       cpuhp_cpufreq_online,
-                                       cpuhp_cpufreq_offline);
+       ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN,
+                                                  "cpufreq:online",
+                                                  cpuhp_cpufreq_online,
+                                                  cpuhp_cpufreq_offline);
        if (ret < 0)
                goto err_if_unreg;
        hp_online = ret;
@@ -2494,7 +2495,7 @@ err_null_driver:
        cpufreq_driver = NULL;
        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 out:
-       put_online_cpus();
+       cpus_read_unlock();
        return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_driver);
@@ -2517,17 +2518,17 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)
        pr_debug("unregistering driver %s\n", driver->name);
 
        /* Protect against concurrent cpu hotplug */
-       get_online_cpus();
+       cpus_read_lock();
        subsys_interface_unregister(&cpufreq_interface);
        remove_boost_sysfs_file();
-       cpuhp_remove_state_nocalls(hp_online);
+       cpuhp_remove_state_nocalls_cpuslocked(hp_online);
 
        write_lock_irqsave(&cpufreq_driver_lock, flags);
 
        cpufreq_driver = NULL;
 
        write_unlock_irqrestore(&cpufreq_driver_lock, flags);
-       put_online_cpus();
+       cpus_read_unlock();
 
        return 0;
 }