aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-07-27 12:34:55 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-07-27 12:34:55 +0200
commit80e30368669e0387d9778b15bd1b985074725a2e (patch)
treefb41faa9d4a067cf823bf04a5f13b5dee5fdb67f /kernel
parentcpufreq: intel_pstate: Fix active mode setting from command line (diff)
parentcpufreq: intel_pstate: Avoid enabling HWP if EPP is not supported (diff)
downloadlinux-dev-80e30368669e0387d9778b15bd1b985074725a2e.tar.xz
linux-dev-80e30368669e0387d9778b15bd1b985074725a2e.zip
Merge back cpufreq material for v5.9.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/cpufreq_schedutil.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 7fbaee24c824..402a09af9f43 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -909,11 +909,7 @@ struct cpufreq_governor *cpufreq_default_governor(void)
}
#endif
-static int __init sugov_register(void)
-{
- return cpufreq_register_governor(&schedutil_gov);
-}
-core_initcall(sugov_register);
+cpufreq_governor_init(schedutil_gov);
#ifdef CONFIG_ENERGY_MODEL
extern bool sched_energy_update;