From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=HOfu=DF=vger.kernel.org=stable-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C376FC4727C
	for <stable@archiver.kernel.org>; Mon, 28 Sep 2020 23:30:32 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by mail.kernel.org (Postfix) with ESMTP id 8336820719
	for <stable@archiver.kernel.org>; Mon, 28 Sep 2020 23:30:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=default; t=1601335832;
	bh=YBeqDoTTv1COv/mV2jDQE4oU4Ml8daQLTPiWYQ8o1pc=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From;
	b=tctV6DDdHUkqy6NSiJf+XQXw+C5m04wL7ow6unSPQ1gDy7eFBWu0dfIkKif7S73uu
	 v9e3Wt8i6MKXaEgRdPgQoD+2KWHbpvRZ2nvXlR3qEPXE5rfjeCvmPuXYF8BQiA1i3W
	 Dn6P7akmIsA9zVagX5tzY5Og5WNI+F1rGuxQ8g+U=
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727131AbgI1Xac (ORCPT <rfc822;stable@archiver.kernel.org>);
        Mon, 28 Sep 2020 19:30:32 -0400
Received: from mail.kernel.org ([198.145.29.99]:53594 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726986AbgI1Xab (ORCPT <rfc822;stable@vger.kernel.org>);
        Mon, 28 Sep 2020 19:30:31 -0400
Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by mail.kernel.org (Postfix) with ESMTPSA id F0E05221E8;
        Mon, 28 Sep 2020 22:11:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
        s=default; t=1601331093;
        bh=YBeqDoTTv1COv/mV2jDQE4oU4Ml8daQLTPiWYQ8o1pc=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=Hjx+tNOq1Riy+XNlQ3y1QeseKZxGAFUVtgeV0Y/P4EL/XtY9dzpUL2s+kM97s12Z0
         hbUh4DkQBxnQVMbDeJiEi8ghw3tV7qOKCZwUA7iOSp3reMkdSPK05045/LtP4OrOiC
         3S0wMAcBcoKxOEvVY8gS/dJqE1QfSZvz+3xse8+A=
Date:   Mon, 28 Sep 2020 18:11:31 -0400
From:   Sasha Levin <sashal@kernel.org>
To:     Jinpu Wang <jinpu.wang@cloud.ionos.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        stable <stable@vger.kernel.org>
Subject: Re: [stable queue/5.4] build errors on queue/5.4
Message-ID: <20200928221131.GF2219727@sasha-vm>
References: <CAMGffEnTKBjKq7xLxFBPcigwrA4=LM+M_EL+tGYS_oZeY=2ywA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <CAMGffEnTKBjKq7xLxFBPcigwrA4=LM+M_EL+tGYS_oZeY=2ywA@mail.gmail.com>
Precedence: bulk
List-ID: <stable.vger.kernel.org>
X-Mailing-List: stable@vger.kernel.org

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