tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fix from Rafael Wysocki:
"This fixes a coding mistake in the x86_pkg_temp_thermal Intel thermal
driver that was introduced by an incorrect conflict resolution during
a merge (Zhang Rui)"

* tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature

Linus Torvalds 7586ac7c e0f8e1a7

+1
+1
drivers/thermal/intel/x86_pkg_temp_thermal.c
··· 329 329 tj_max = intel_tcc_get_tjmax(cpu); 330 330 if (tj_max < 0) 331 331 return tj_max; 332 + tj_max *= 1000; 332 333 333 334 zonedev = kzalloc(sizeof(*zonedev), GFP_KERNEL); 334 335 if (!zonedev)