diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-02 22:00:56 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-02 22:00:56 +0200 |
commit | 9795a0ddf8adadb671d2da8b05b884ee450cb3fe (patch) | |
tree | 8ad009609bdb7dbee9a4de2647b995e4c3b011c3 /drivers/cpufreq | |
parent | 8c539776ac83c0857395e1ccc9c6b516521a2d32 (diff) | |
parent | 33aa46f252c703e42c81a76696cd0c240f2281e4 (diff) |
Merge back cpufreq material for v5.8.
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 4d3429b2058f..8e23a698ce04 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2771,6 +2771,8 @@ static int __init intel_pstate_init(void) pr_info("Invalid MSRs\n"); return -ENODEV; } + /* Without HWP start in the passive mode. */ + default_driver = &intel_cpufreq; hwp_cpu_matched: /* @@ -2816,7 +2818,6 @@ static int __init intel_pstate_setup(char *str) if (!strcmp(str, "disable")) { no_load = 1; } else if (!strcmp(str, "passive")) { - pr_info("Passive mode enabled\n"); default_driver = &intel_cpufreq; no_hwp = 1; } |