Commit 161bd53e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back final cpufreq fixes for 6.10.

parents 4e89a530 d92467ad

drivers/cpufreq/acpi-cpufreq.c

+3 −1
Original line number Diff line number Diff line
@@ -890,8 +890,10 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	if (perf->states[0].core_frequency * 1000 != freq_table[0].frequency)

		pr_warn(FW_WARN "P-state 0 is not max freq\n");



	if (acpi_cpufreq_driver.set_boost)

	if (acpi_cpufreq_driver.set_boost) {

		set_boost(policy, acpi_cpufreq_driver.boost_enabled);

		policy->boost_enabled = acpi_cpufreq_driver.boost_enabled;

	}



	return result;

drivers/cpufreq/cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,8 @@ static int cpufreq_online(unsigned int cpu) 
		}



		/* Let the per-policy boost flag mirror the cpufreq_driver boost during init */

		policy->boost_enabled = cpufreq_boost_enabled() && policy_has_boost_freq(policy);

		if (cpufreq_boost_enabled() && policy_has_boost_freq(policy))

			policy->boost_enabled = true;



		/*

		 * The initialization has succeeded and the policy is online.