summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2015-11-20 18:54:30 +0530
committerJohn Stultz <john.stultz@linaro.org>2016-02-16 13:53:08 -0800
commitbc68f6c4efbd4ddbb15817203f18b7941d9ffd52 (patch)
tree5372fd94c9b2d00965d402fa37258b9dc58cd63a
parente197a21971a5bfb9d335a9baa701c70b973fdab4 (diff)
cpufreq: interactive: build fixes for 4.4
Bring back cpufreq_{get,put}_global_kobject() definitions removed by upstream commit 8eec1020f0c0 "cpufreq: create cpu/cpufreq at boot time" to fix build failures. Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--drivers/cpufreq/cpufreq_interactive.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index f2be0d87d73d..9259d4829765 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -116,6 +116,28 @@ struct cpufreq_interactive_tunables {
bool io_is_busy;
};
+/*
+ * 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;