diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-27 13:01:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-27 13:01:36 -0800 |
| commit | 274d2f8b0c032ca3c1ae88194b75edd2669368b0 (patch) | |
| tree | adfea978b5327f7e2fab1bff9accd902526e126a /drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h | |
| parent | 0d1e013fd9246fcf73a078999487ba47d1dd1bb9 (diff) | |
| parent | acd7e9ee57c880b99671dd99680cb707b7b5b0ee (diff) | |
| download | linux-274d2f8b0c032ca3c1ae88194b75edd2669368b0.tar.bz2 | |
Merge tag 'thermal-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki:
"Add locking to the Intel int340x thermal control driver to prevent its
thermal zone callbacks from racing with firmware-induced thermal trip
point updates (Srinivas Pandruvada, Rafael Wysocki)"
* tag 'thermal-6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type()
thermal: intel: int340x: Protect trip temperature from concurrent updates
Diffstat (limited to 'drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h')
| -rw-r--r-- | drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h index 3b4971df1b33..8f9872afd0d3 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h @@ -32,6 +32,7 @@ struct int34x_thermal_zone { struct thermal_zone_device_ops *override_ops; void *priv_data; struct acpi_lpat_conversion_table *lpat_table; + struct mutex trip_mutex; }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *, |