cpufreq: Remove temporary fix for race between CPU hotplug and sysfs-writes

Commit "cpufreq: serialize calls to __cpufreq_governor()" had been a temporary
and partial solution to the race condition between writing to a cpufreq sysfs
file and taking a CPU offline. Now that we have a proper and complete solution
to that problem, remove the temporary fix.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index cf016584b4ac93b02327abb1a91c92ebc4eed80d..2863214c5381a7c7f5dbf9c2eb97a3a7d8552976 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1739,15 +1739,13 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
                                                policy->cpu, event);
 
        mutex_lock(&cpufreq_governor_lock);
-       if (policy->governor_busy
-           || (policy->governor_enabled && event == CPUFREQ_GOV_START)
+       if ((policy->governor_enabled && event == CPUFREQ_GOV_START)
            || (!policy->governor_enabled
            && (event == CPUFREQ_GOV_LIMITS || event == CPUFREQ_GOV_STOP))) {
                mutex_unlock(&cpufreq_governor_lock);
                return -EBUSY;
        }
 
-       policy->governor_busy = true;
        if (event == CPUFREQ_GOV_STOP)
                policy->governor_enabled = false;
        else if (event == CPUFREQ_GOV_START)
@@ -1776,9 +1774,6 @@ static int __cpufreq_governor(struct cpufreq_policy *policy,
                        ((event == CPUFREQ_GOV_POLICY_EXIT) && !ret))
                module_put(policy->governor->owner);
 
-       mutex_lock(&cpufreq_governor_lock);
-       policy->governor_busy = false;
-       mutex_unlock(&cpufreq_governor_lock);
        return ret;
 }
 

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index cca885dac1d3da88345d72501cd249613b3d01d2..d568f3975eeb66125a28aa8a31ccbb712de56807 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -76,7 +76,6 @@ struct cpufreq_policy {
        struct cpufreq_governor *governor; /* see below */
        void                    *governor_data;
        bool                    governor_enabled; /* governor start/stop flag */
-       bool                    governor_busy;
 
        struct work_struct      update; /* if update_policy() needs to be
                                         * called, but you're in IRQ context */