Skip to content

Commit 0c2ec0f

Browse files
committed
Merge branch 'acpi-thermal'
Merge ACPI thermal driver changes for 6.6-rc1: - Drop non-functional nocrt parameter from ACPI thermal (Mario Limonciello). - Clean up the ACPI thermal driver, rework the handling of firmware notifications in it and make it provide a table of generic trip point structures to the core during initialization (Rafael Wysocki). * acpi-thermal: ACPI: thermal: Eliminate code duplication from acpi_thermal_notify() ACPI: thermal: Drop unnecessary thermal zone callbacks ACPI: thermal: Rework thermal_get_trend() ACPI: thermal: Use trip point table to register thermal zones thermal: core: Rework and rename __for_each_thermal_trip() ACPI: thermal: Introduce struct acpi_thermal_trip ACPI: thermal: Carry out trip point updates under zone lock ACPI: thermal: Clean up acpi_thermal_register_thermal_zone() thermal: core: Add priv pointer to struct thermal_trip thermal: core: Introduce thermal_zone_device_exec() thermal: core: Do not handle trip points with invalid temperature ACPI: thermal: Drop redundant local variable from acpi_thermal_resume() ACPI: thermal: Do not attach private data to ACPI handles ACPI: thermal: Drop enabled flag from struct acpi_thermal_active ACPI: thermal: Drop nocrt parameter
2 parents 9bd0c41 + 4ab4b3b commit 0c2ec0f

File tree

6 files changed

+239
-265
lines changed

6 files changed

+239
-265
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6275,10 +6275,6 @@
62756275
-1: disable all critical trip points in all thermal zones
62766276
<degrees C>: override all critical trip points
62776277

6278-
thermal.nocrt= [HW,ACPI]
6279-
Set to disable actions on ACPI thermal zone
6280-
critical and hot trip points.
6281-
62826278
thermal.off= [HW,ACPI]
62836279
1: disable ACPI thermal control
62846280

0 commit comments

Comments
 (0)