Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki:
"Fix a regression caused by an inadvertent change of the
THERMAL_GENL_ATTR_CPU_CAPABILITY value in one of the recent thermal
commits (Zhang Rui) and drop a stale piece of documentation (Daniel
Lezcano)"
* tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal/cpufreq_cooling: Remove structure member documentation
thermal/netlink: Prevent userspace segmentation fault by adjusting UAPI header
+1
-3
-2
drivers/thermal/cpufreq_cooling.c
-2
drivers/thermal/cpufreq_cooling.c
···
57
57
* @max_level: maximum cooling level. One less than total number of valid
58
58
* cpufreq frequencies.
59
59
* @em: Reference on the Energy Model of the device
60
-
* @cdev: thermal_cooling_device pointer to keep track of the
61
-
* registered cooling device.
62
60
* @policy: cpufreq policy.
63
61
* @cooling_ops: cpufreq callbacks to thermal cooling device ops
64
62
* @idle_time: idle time stats
+1
-1
include/uapi/linux/thermal.h
+1
-1
include/uapi/linux/thermal.h
···
30
30
THERMAL_GENL_ATTR_TZ,
31
31
THERMAL_GENL_ATTR_TZ_ID,
32
32
THERMAL_GENL_ATTR_TZ_TEMP,
33
-
THERMAL_GENL_ATTR_TZ_PREV_TEMP,
34
33
THERMAL_GENL_ATTR_TZ_TRIP,
35
34
THERMAL_GENL_ATTR_TZ_TRIP_ID,
36
35
THERMAL_GENL_ATTR_TZ_TRIP_TYPE,
···
53
54
THERMAL_GENL_ATTR_THRESHOLD,
54
55
THERMAL_GENL_ATTR_THRESHOLD_TEMP,
55
56
THERMAL_GENL_ATTR_THRESHOLD_DIRECTION,
57
+
THERMAL_GENL_ATTR_TZ_PREV_TEMP,
56
58
__THERMAL_GENL_ATTR_MAX,
57
59
};
58
60
#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)