| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Amit Kucheria <amit.kucheria@linaro.org> |
| Date: Mon, 21 Oct 2019 17:45:12 +0530 |
| Subject: UPSTREAM: cpufreq: Initialize the governors in core_initcall |
| |
| Initialize the cpufreq governors earlier to allow for earlier |
| performance control during the boot process. |
| |
| Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> |
| Acked-by: Viresh Kumar <viresh.kumar@linaro.org> |
| Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> |
| Link: https://lore.kernel.org/r/b98eae9b44eb2f034d7f5d12a161f5f831be1eb7.1571656015.git.amit.kucheria@linaro.org |
| (cherry picked from commit 3f6ec871e1c2b360aaf022e90bb99dcc016b3874) |
| Signed-off-by: John Stultz <john.stultz@linaro.org> |
| Bug: 146449535 |
| Change-Id: Ib5599ade3811fb44a15cda6ee3791d997207cad5 |
| --- |
| drivers/cpufreq/cpufreq_conservative.c | 2 +- |
| drivers/cpufreq/cpufreq_ondemand.c | 2 +- |
| drivers/cpufreq/cpufreq_performance.c | 2 +- |
| drivers/cpufreq/cpufreq_powersave.c | 2 +- |
| drivers/cpufreq/cpufreq_userspace.c | 2 +- |
| kernel/sched/cpufreq_schedutil.c | 2 +- |
| 6 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c |
| index b66e81c06a57..737ff3b9c2c0 100644 |
| --- a/drivers/cpufreq/cpufreq_conservative.c |
| +++ b/drivers/cpufreq/cpufreq_conservative.c |
| @@ -346,7 +346,7 @@ struct cpufreq_governor *cpufreq_default_governor(void) |
| return CPU_FREQ_GOV_CONSERVATIVE; |
| } |
| |
| -fs_initcall(cpufreq_gov_dbs_init); |
| +core_initcall(cpufreq_gov_dbs_init); |
| #else |
| module_init(cpufreq_gov_dbs_init); |
| #endif |
| diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c |
| index dced033875bf..82a4d37ddecb 100644 |
| --- a/drivers/cpufreq/cpufreq_ondemand.c |
| +++ b/drivers/cpufreq/cpufreq_ondemand.c |
| @@ -483,7 +483,7 @@ struct cpufreq_governor *cpufreq_default_governor(void) |
| return CPU_FREQ_GOV_ONDEMAND; |
| } |
| |
| -fs_initcall(cpufreq_gov_dbs_init); |
| +core_initcall(cpufreq_gov_dbs_init); |
| #else |
| module_init(cpufreq_gov_dbs_init); |
| #endif |
| diff --git a/drivers/cpufreq/cpufreq_performance.c b/drivers/cpufreq/cpufreq_performance.c |
| index aaa04dfcacd9..def9afe0f5b8 100644 |
| --- a/drivers/cpufreq/cpufreq_performance.c |
| +++ b/drivers/cpufreq/cpufreq_performance.c |
| @@ -50,5 +50,5 @@ MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>"); |
| MODULE_DESCRIPTION("CPUfreq policy governor 'performance'"); |
| MODULE_LICENSE("GPL"); |
| |
| -fs_initcall(cpufreq_gov_performance_init); |
| +core_initcall(cpufreq_gov_performance_init); |
| module_exit(cpufreq_gov_performance_exit); |
| diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c |
| index c143dc237d87..1ae66019eb83 100644 |
| --- a/drivers/cpufreq/cpufreq_powersave.c |
| +++ b/drivers/cpufreq/cpufreq_powersave.c |
| @@ -43,7 +43,7 @@ struct cpufreq_governor *cpufreq_default_governor(void) |
| return &cpufreq_gov_powersave; |
| } |
| |
| -fs_initcall(cpufreq_gov_powersave_init); |
| +core_initcall(cpufreq_gov_powersave_init); |
| #else |
| module_init(cpufreq_gov_powersave_init); |
| #endif |
| diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c |
| index cbd81c58cb8f..b43e7cd502c5 100644 |
| --- a/drivers/cpufreq/cpufreq_userspace.c |
| +++ b/drivers/cpufreq/cpufreq_userspace.c |
| @@ -147,7 +147,7 @@ struct cpufreq_governor *cpufreq_default_governor(void) |
| return &cpufreq_gov_userspace; |
| } |
| |
| -fs_initcall(cpufreq_gov_userspace_init); |
| +core_initcall(cpufreq_gov_userspace_init); |
| #else |
| module_init(cpufreq_gov_userspace_init); |
| #endif |
| diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c |
| index b6f56e7c8dd1..9b8916fd00a2 100644 |
| --- a/kernel/sched/cpufreq_schedutil.c |
| +++ b/kernel/sched/cpufreq_schedutil.c |
| @@ -913,7 +913,7 @@ static int __init sugov_register(void) |
| { |
| return cpufreq_register_governor(&schedutil_gov); |
| } |
| -fs_initcall(sugov_register); |
| +core_initcall(sugov_register); |
| |
| #ifdef CONFIG_ENERGY_MODEL |
| extern bool sched_energy_update; |