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>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index cf016584b4ac..2863214c5381 100644
--- 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;
 }