sched/cpufreq_sched: properly handle config as module
When cpufreq_sched is built as a module we have to handle it properly.
Add related fixes.
Signed-off-by: Juri Lelli <juri.lelli@arm.com>
diff --git a/kernel/sched/cpufreq_sched.c b/kernel/sched/cpufreq_sched.c
index 8c5ad48..e6de060 100644
--- a/kernel/sched/cpufreq_sched.c
+++ b/kernel/sched/cpufreq_sched.c
@@ -343,7 +343,11 @@
cpufreq_unregister_governor(&cpufreq_gov_sched);
}
-/* Try to make this the default governor */
-fs_initcall(cpufreq_sched_init);
-
MODULE_LICENSE("GPL v2");
+
+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED
+fs_initcall(cpufreq_sched_init);
+#else
+module_init(cpufreq_sched_init);
+#endif
+module_exit(cpufreq_sched_exit);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 216d5a8..9153b9d 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1423,7 +1423,7 @@
{
return static_key_false(&__sched_energy_freq);
}
-#ifdef CONFIG_CPU_FREQ_GOV_SCHED
+#if IS_ENABLED(CONFIG_CPU_FREQ_GOV_SCHED)
void cpufreq_sched_set_cap(int cpu, unsigned long util);
void cpufreq_sched_reset_cap(int cpu);
#else