Skip to content

Commit 5016320

Browse files
committed
Merge tag 'pm-4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "Two fixes for problems introduced recently in the cpufreq core and the intel_pstate driver. Specifics: - Fix a silly mistake related to the clamp_val() usage in a function added by a recent commit (Rafael Wysocki). - Reduce the log level of an annoying message added to intel_pstate during the recent merge window (Srinivas Pandruvada)" * tag 'pm-4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: Fix clamp_val() usage in cpufreq_driver_fast_switch() cpufreq: intel_pstate: Downgrade print level for _PPC
2 parents d46d025 + 8cd8cbd commit 5016320

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/cpufreq/cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
18321832
unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
18331833
unsigned int target_freq)
18341834
{
1835-
clamp_val(target_freq, policy->min, policy->max);
1835+
target_freq = clamp_val(target_freq, policy->min, policy->max);
18361836

18371837
return cpufreq_driver->fast_switch(policy, target_freq);
18381838
}

drivers/cpufreq/intel_pstate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
449449
cpu->acpi_perf_data.states[0].core_frequency =
450450
policy->cpuinfo.max_freq / 1000;
451451
cpu->valid_pss_table = true;
452-
pr_info("_PPC limits will be enforced\n");
452+
pr_debug("_PPC limits will be enforced\n");
453453

454454
return;
455455

0 commit comments

Comments
 (0)