Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c25454 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "cpufreq: interactive: build fixes for 4.4"" into msm-4.9

parents be953a4a ab8b3dbe
Loading
Loading
Loading
Loading
+0 −22
Original line number Diff line number Diff line
@@ -162,28 +162,6 @@ struct cpufreq_interactive_tunables {
	bool enable_prediction;
};

/*
 * HACK: FIXME: Bring back cpufreq_{get,put}_global_kobject()
 * definition removed by upstream commit 8eec1020f0c0 "cpufreq:
 * create cpu/cpufreq at boot time" to fix build failures.
 */
static int cpufreq_global_kobject_usage;

int cpufreq_get_global_kobject(void)
{
	if (!cpufreq_global_kobject_usage++)
		return kobject_add(cpufreq_global_kobject,
				&cpu_subsys.dev_root->kobj, "%s", "cpufreq");

	return 0;
}

void cpufreq_put_global_kobject(void)
{
	if (!--cpufreq_global_kobject_usage)
		kobject_del(cpufreq_global_kobject);
}

/* For cases where we have single governor instance for system */
static struct cpufreq_interactive_tunables *common_tunables;
static struct cpufreq_interactive_tunables *cached_common_tunables;