Skip to content

Commit 4da34b7

Browse files
committed
Merge tag 'thermal-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki: "This fixes the control CPU selection in the intel_powerclamp thermal driver" * tag 'thermal-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal: intel_powerclamp: Use first online CPU as control_cpu
2 parents 20df096 + 4bb7f6c commit 4da34b7

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/thermal/intel/intel_powerclamp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,11 +516,7 @@ static int start_power_clamp(void)
516516
cpus_read_lock();
517517

518518
/* prefer BSP */
519-
control_cpu = 0;
520-
if (!cpu_online(control_cpu)) {
521-
control_cpu = get_cpu();
522-
put_cpu();
523-
}
519+
control_cpu = cpumask_first(cpu_online_mask);
524520

525521
clamping = true;
526522
schedule_delayed_work(&poll_pkg_cstate_work, 0);

0 commit comments

Comments
 (0)