diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-14 02:52:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-14 02:52:26 +0300 |
| commit | ba2b137d10bafc3cc514e52172b549e64a5402fb (patch) | |
| tree | 1f57795b7555cc19e1453247e5e4bd27aa185a76 /include/linux | |
| parent | 71893f116109c92e4cd230d990fad5bd7cb4f99d (diff) | |
| parent | b907b408ca64482989cd95dacef804ce509a3673 (diff) | |
| download | linux-ba2b137d10bafc3cc514e52172b549e64a5402fb.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management update from Zhang Rui:
- Fix race condition in imx_thermal_probe() (Mikhail Lappo)
- Add cooling device's statistics in sysfs (Viresh Kumar)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: Add cooling device's statistics in sysfs
thermal: imx: Fix race condition in imx_thermal_probe()
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thermal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 8c5302374eaa..7834be668d80 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -148,6 +148,7 @@ struct thermal_cooling_device { struct device device; struct device_node *np; void *devdata; + void *stats; const struct thermal_cooling_device_ops *ops; bool updated; /* true if the cooling device does not need update */ struct mutex lock; /* protect thermal_instances list */ |