diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-01 01:36:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-01 01:36:35 +0300 |
| commit | cf3c8f84d1401fed5010784034d104cc689061d5 (patch) | |
| tree | f287526b311ff2e78df673cef667b8667b2deb0c /drivers/cpufreq/cpufreq-nforce2.c | |
| parent | a62aa6f7f50a9a0af5e07d98774f8a7b439d390f (diff) | |
| parent | 82b2c6ffd399c9fcd542fd681bb8c6d41f035c7e (diff) | |
| download | linux-cf3c8f84d1401fed5010784034d104cc689061d5.tar.xz | |
Merge tag 'pm-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more power manadement updates from Rafael Wysocki:
"Prevent cpufreq from creating excessively large stack frames and fix
the handling of devices deleted during system-wide resume in the PM
core (Rafael Wysocki), revert a problematic commit affecting the
cpupower utility and correct its man page (Thomas Renninger,
Brahadambal Srinivasan), and improve the intel_pstate_tracer utility
(Doug Smythies)"
* tag 'pm-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
tools/power/x86/intel_pstate_tracer: change several graphs to autoscale y-axis
tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility
Correction to manpage of cpupower
cpufreq: Avoid creating excessively large stack frames
PM: core: Fix handling of devices deleted during system-wide resume
cpupower: Revert library ABI changes from commit ae2917093fb60bdc1ed3e
Diffstat (limited to 'drivers/cpufreq/cpufreq-nforce2.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq-nforce2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c index cd53272e2fa2..f7a7bcf6f52e 100644 --- a/drivers/cpufreq/cpufreq-nforce2.c +++ b/drivers/cpufreq/cpufreq-nforce2.c @@ -291,7 +291,7 @@ static int nforce2_target(struct cpufreq_policy *policy, * nforce2_verify - verifies a new CPUFreq policy * @policy: new policy */ -static int nforce2_verify(struct cpufreq_policy *policy) +static int nforce2_verify(struct cpufreq_policy_data *policy) { unsigned int fsb_pol_max; |