Merge branch 'powercap'

* powercap:
  powercap/drivers/dtpm: Add the experimental label to the option description
  powercap/drivers/dtpm: Fix root node initialization
This commit is contained in:
Rafael J. Wysocki 2021-03-05 16:19:10 +01:00
commit 7bff4c26b6
2 changed files with 4 additions and 1 deletions

View File

@ -45,7 +45,7 @@ config IDLE_INJECT
on a per CPU basis.
config DTPM
bool "Power capping for Dynamic Thermal Power Management"
bool "Power capping for Dynamic Thermal Power Management (EXPERIMENTAL)"
help
This enables support for the power capping for the dynamic
thermal power management userspace engine.

View File

@ -207,6 +207,9 @@ int dtpm_release_zone(struct powercap_zone *pcz)
if (dtpm->ops)
dtpm->ops->release(dtpm);
if (root == dtpm)
root = NULL;
kfree(dtpm);
return 0;