diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 18:26:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-21 18:26:00 -0700 |
| commit | 4da34b7d175dc99b8befebd69e96546c960d526c (patch) | |
| tree | 710b004b47bd4a560a9e7841ec14bfbb830df335 | |
| parent | 20df09614775475fecc37a786a382755ba3d7d2b (diff) | |
| parent | 4bb7f6c2781e46fc5bd00475a66df2ea30ef330d (diff) | |
| download | scsi-devel-master.tar.gz | |
Merge tag 'thermal-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pmHEADmaster
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
| -rw-r--r-- | drivers/thermal/intel/intel_powerclamp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c index 2a5570b9799a9a..b80e25ec12615f 100644 --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c @@ -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); |