From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DC14C61DA4 for ; Fri, 3 Feb 2023 14:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233378AbjBCOSf (ORCPT ); Fri, 3 Feb 2023 09:18:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233171AbjBCOSU (ORCPT ); Fri, 3 Feb 2023 09:18:20 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E849D28219; Fri, 3 Feb 2023 06:17:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B3FC361F59; Fri, 3 Feb 2023 14:17:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5C73C4339B; Fri, 3 Feb 2023 14:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675433861; bh=dQBAdVTSaFMdrkvi5jooHf8C4M5IX9U6/h+idH3Nbps=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZVWZzcnghKdg0dcklR0v569t1WKulSoyQWtEqY/qXe081bk8UBFN2dqBqSTlzqjm1 R6qznfa0ME2eSHQUhD5H1yPVy757rEMBPtndsxKyBf9hIhWvHjH14996mD+az34rFZ PwKUl4/3l4Wugvno+SBkVx/OLVOEfDIRCRhMyDfK6edS2gk1TinIaXQOKu9SS6O7SL T7111Hholhsg05kf+SQDgcrK89ZVTZKnTQtRie5O9qG4Ik5M3fjJhTweQpw5awZTsa +14SN9B0nOyC+ghju15RUbDzISVBXGuzMa8BqrTETscXSGVEaKu5yur1oiGJDPxkUc 2+snMF9UrV4NA== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id A7345405BE; Fri, 3 Feb 2023 11:17:38 -0300 (-03) Date: Fri, 3 Feb 2023 11:17:38 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Kim Phillips , Florian Fischer , Ravi Bangoria , Xing Zhengjun , Rob Herring , Kang Minchul , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Sandipan Das , Jing Zhang , linuxppc-dev@lists.ozlabs.org, Kajol Jain , Stephane Eranian , Perry Taylor , Caleb Biggers Subject: Re: [PATCH v1] perf pmu: Fix aarch64 build Message-ID: References: <20230203014014.75720-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Em Thu, Feb 02, 2023 at 05:41:22PM -0800, Ian Rogers escreveu: > On Thu, Feb 2, 2023 at 5:40 PM Ian Rogers wrote: > > > > ARM64 overrides a weak function but a previous change had broken the > > build. > > > > Fixes: 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") > > As 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") is > only on tmp.perf/core then it may be best to just squash this fix into > that. Yeah, that was my intention, I'll fold it there to keep bisection, thanks for fixing it so fast, I'll double check on my rk3399 board and on again on the cross-build container. - Arnaldo > > Thanks, > Ian > > > Signed-off-by: Ian Rogers > > --- > > tools/perf/arch/arm64/util/pmu.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/pmu.c > > index 2779840d8896..fa143acb4c8d 100644 > > --- a/tools/perf/arch/arm64/util/pmu.c > > +++ b/tools/perf/arch/arm64/util/pmu.c > > @@ -22,6 +22,8 @@ static struct perf_pmu *pmu__find_core_pmu(void) > > return NULL; > > > > return pmu; > > + } > > + return NULL; > > } > > > > const struct pmu_metrics_table *pmu_metrics_table__find(void) > > -- > > 2.39.1.519.gcb327c4b5f-goog > > -- - Arnaldo