Commit 4da34b7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 20df0961 4bb7f6c2

drivers/thermal/intel/intel_powerclamp.c

+1 −5
Original line number Diff line number Diff line
@@ -516,11 +516,7 @@ static int start_power_clamp(void) 
	cpus_read_lock();



	/* prefer BSP */

	control_cpu = 0;

	if (!cpu_online(control_cpu)) {

		control_cpu = get_cpu();

		put_cpu();

	}

	control_cpu = cpumask_first(cpu_online_mask);



	clamping = true;

	schedule_delayed_work(&poll_pkg_cstate_work, 0);