Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50163203 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d46d0256 8cd8cbd4

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier); 
unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,

					unsigned int target_freq)

{

	clamp_val(target_freq, policy->min, policy->max);

	target_freq = clamp_val(target_freq, policy->min, policy->max);



	return cpufreq_driver->fast_switch(policy, target_freq);

}

drivers/cpufreq/intel_pstate.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy) 
		cpu->acpi_perf_data.states[0].core_frequency =

					policy->cpuinfo.max_freq / 1000;

	cpu->valid_pss_table = true;

	pr_info("_PPC limits will be enforced\n");

	pr_debug("_PPC limits will be enforced\n");



	return;