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

Commit 8cd8cbd4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq-fixes' 

* pm-cpufreq-fixes:
  cpufreq: Fix clamp_val() usage in cpufreq_driver_fast_switch()
  cpufreq: intel_pstate: Downgrade print level for _PPC
parents 1a695a90 b9af6948

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;