Commit cfbed9b5 authored Apr 06, 2018 by Greg Kroah-Hartman

Revert "cpufreq: Fix governor module removal race"

This reverts commit 0049457b which was
commit a8b149d32b663c1a4105273295184b78f53d33cf upstream.

The backport was not correct, so just drop it entirely.

Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a99aaecc

drivers/cpufreq/cpufreq.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -631,8 +631,6 @@ static int cpufreq_parse_governor(char str_governor, unsigned int policy,
		*governor = t;
		err = 0;
		}
		if (t && !try_module_get(t->owner))
		t = NULL;

		mutex_unlock(&cpufreq_governor_mutex);
		}
		@@ -761,10 +759,6 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
		return -EINVAL;

		ret = cpufreq_set_policy(policy, &new_policy);

		if (new_policy.governor)
		module_put(new_policy.governor->owner);

		return ret ? ret : count;
		}