diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-11-04 17:03:04 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-11-04 17:03:04 +0100 |
| commit | 5469a8deac05391781bcd27e7c40f2c35121ca09 (patch) | |
| tree | e94d2a347ef09681af7f19fd33b4cc2ea3286496 /tools | |
| parent | Linux 6.12-rc6 (diff) | |
| parent | thermal/of: support thermal zones w/o trips subnode (diff) | |
| download | wireguard-linux-5469a8deac05391781bcd27e7c40f2c35121ca09.tar.xz wireguard-linux-5469a8deac05391781bcd27e7c40f2c35121ca09.zip | |
Merge tag 'thermal-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Merge thermal driver fixes for 6.12-rc7 from Daniel Lezcano:
"- Remove a false lockdep backtrace in the LMh driver (Dmitry
Baryshkov)
- Fix sampling handler context ptr in the libthermal (Emil Dahl Juhl)
- Remove the thermal soft link when doing a make clean. The link is
created at compilation time (Zhang Jiao)
- Accept thermal zone without trip points as stated in the bindings,
otherwise the thermal zone fails to initialize (Icenowy Zheng)"
* tag 'thermal-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
thermal/of: support thermal zones w/o trips subnode
tools/lib/thermal: Remove the thermal.h soft link when doing make clean
tools/lib/thermal: Fix sampling handler context ptr
thermal/drivers/qcom/lmh: Remove false lockdep backtrace
Diffstat (limited to '')
| -rw-r--r-- | tools/lib/thermal/Makefile | 4 | ||||
| -rw-r--r-- | tools/lib/thermal/sampling.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/lib/thermal/Makefile b/tools/lib/thermal/Makefile index 2d0d255fd0e1..8890fd57b110 100644 --- a/tools/lib/thermal/Makefile +++ b/tools/lib/thermal/Makefile @@ -121,7 +121,9 @@ all: fixdep clean: $(call QUIET_CLEAN, libthermal) $(RM) $(LIBTHERMAL_A) \ - *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBTHERMAL_VERSION) .*.d .*.cmd LIBTHERMAL-CFLAGS $(LIBTHERMAL_PC) + *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBTHERMAL_VERSION) \ + .*.d .*.cmd LIBTHERMAL-CFLAGS $(LIBTHERMAL_PC) \ + $(srctree)/tools/$(THERMAL_UAPI) $(LIBTHERMAL_PC): $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \ diff --git a/tools/lib/thermal/sampling.c b/tools/lib/thermal/sampling.c index 70577423a9f0..f67c1f9ea1d7 100644 --- a/tools/lib/thermal/sampling.c +++ b/tools/lib/thermal/sampling.c @@ -16,6 +16,8 @@ static int handle_thermal_sample(struct nl_msg *n, void *arg) struct thermal_handler_param *thp = arg; struct thermal_handler *th = thp->th; + arg = thp->arg; + genlmsg_parse(nlh, 0, attrs, THERMAL_GENL_ATTR_MAX, NULL); switch (genlhdr->cmd) { |