[stable queue/5.4] build errors on queue/5.4

[stable queue/5.4] build errors on queue/5.4

[Jinpu Wang]

Hi Sasha,

I noticed build error on latest stable-rc/queue/5.4 branch:

util/parse-events.c: In function 'parse_events_add_pmu':
util/parse-events.c:1373:11: error: 'struct perf_evsel_config_term'
has no member named 'free_str'
    if (pos->free_str)
           ^~
In file included from util/parse-events.c:4:
util/parse-events.c:1374:20: error: 'union <anonymous>' has no member
named 'str'
     zfree(&pos->val.str);
                    ^
/<<PKGBUILDDIR>>/tools/include/linux/zalloc.h:10:38: note: in
definition of macro 'zfree'
 #define zfree(ptr) __zfree((void **)(ptr))

revert both
d6ac1bd91161 ("perf parse-events: Fix incorrect conversion of 'if ()
free()' to 'zfree()'")
b6f48cb0c18b ("perf parse-events: Fix memory leaks found on parse_events")

Fixed the problem.

Thanks!
-- 
Jinpu Wang
Linux Kernel Developer

Application Support (IONOS Cloud)

1&1 IONOS SE | Greifswalder Str. 207 | 10405 Berlin | Germany
Phone:
E-mail: jinpu.wang@cloud.ionos.com | Web: www.ionos.de

Hauptsitz Montabaur, Amtsgericht Montabaur, HRB 24498

Vorstand: Dr. Christian Böing, Hüseyin Dogan, Dr. Martin Endreß,
Hans-Henning Kettler, Arthur Mai, Matthias Steinberg, Achim Weiß
Aufsichtsratsvorsitzender: Markus Kadelke


Member of United Internet

Diese E-Mail kann vertrauliche und/oder gesetzlich geschützte
Informationen enthalten. Wenn Sie nicht der bestimmungsgemäße Adressat
sind oder diese E-Mail irrtümlich erhalten haben, unterrichten Sie
bitte den Absender und vernichten Sie diese E-Mail. Anderen als dem
bestimmungsgemäßen Adressaten ist untersagt, diese E-Mail zu
speichern, weiterzuleiten oder ihren Inhalt auf welche Weise auch
immer zu verwenden.

This e-mail may contain confidential and/or privileged information. If
you are not the intended recipient of this e-mail, you are hereby
notified that saving, distribution or use of the content of this
e-mail in any way is prohibited. If you have received this e-mail in
error, please notify the sender and delete the e-mail.

Re: [stable queue/5.4] build errors on queue/5.4

[Sasha Levin]

On Mon, Sep 28, 2020 at 10:55:03AM +0200, Jinpu Wang wrote:
>Hi Sasha,
>
>I noticed build error on latest stable-rc/queue/5.4 branch:
>
>util/parse-events.c: In function 'parse_events_add_pmu':
>util/parse-events.c:1373:11: error: 'struct perf_evsel_config_term'
>has no member named 'free_str'
>    if (pos->free_str)
>           ^~
>In file included from util/parse-events.c:4:
>util/parse-events.c:1374:20: error: 'union <anonymous>' has no member
>named 'str'
>     zfree(&pos->val.str);
>                    ^
>/<<PKGBUILDDIR>>/tools/include/linux/zalloc.h:10:38: note: in
>definition of macro 'zfree'
> #define zfree(ptr) __zfree((void **)(ptr))
>
>revert both
>d6ac1bd91161 ("perf parse-events: Fix incorrect conversion of 'if ()
>free()' to 'zfree()'")
>b6f48cb0c18b ("perf parse-events: Fix memory leaks found on parse_events")
>
>Fixed the problem.

Fixed up, thanks!

-- 
Thanks,
Sasha