Commit 7bff4c26 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'powercap' 

* powercap:
  powercap/drivers/dtpm: Add the experimental label to the option description
  powercap/drivers/dtpm: Fix root node initialization
parents 44cc89f7 9e2be308

drivers/powercap/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/powercap/dtpm.c

+3 −0
Original line number Diff line number Diff line
@@ -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;