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 81F01C636D3 for ; Fri, 3 Feb 2023 01:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231970AbjBCBlo (ORCPT ); Thu, 2 Feb 2023 20:41:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbjBCBlj (ORCPT ); Thu, 2 Feb 2023 20:41:39 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97A1887D17 for ; Thu, 2 Feb 2023 17:41:36 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id h12so3371636wrv.10 for ; Thu, 02 Feb 2023 17:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=rothOJAx61IhY6WBzLgJ0pLvV1L69tGtBH8EM756NO8=; b=JGGtJ43mQQSjD5iDplV0TKr5vkx/VXre07uHn16ZwJoqK0iPdnRFzazXeDBOc7drVf iA0hyjJJhKMHtfH3J1Dlkupz5f3mvNhyF4tWWBBqrdkFifGWfW9vpiP1LYtm1tANuk5x CDkTWs5aoqcOApygErzXmNuu4KVA8GufFtqBRQC7GQDvOiJnodRDgjgOpWpiY69JlNvB hDUGM9TfhF2P6C/nUPpC3ICMfxp6eOUe40TgBJKFqZfK5ZUtLJYNCc+2Ua8JNjpE5nZD DOTe6XGkYm+xIa2VVRfMFDypR9RQhzOvDmr5R+sFK2m6siyVBbM+pn0sDza4ltIdKkYe /KRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rothOJAx61IhY6WBzLgJ0pLvV1L69tGtBH8EM756NO8=; b=DPt69QLXEvM/WM33/6lmEPm7XWFuHX8H7zeNsNOEv/N1c3oY98tF0t2Nby1W2G5rpg c3qcSkv7N4/DJyRD3NN2jrYRGdMsYG9AysgkvCtNuW+7bkawI/8WPmVhjnNCDks7H6/p kITbIbwsomoE2df3kME0y1h8D9D0NoZ5CDWSbKATsQdLnAIJ+eiVYmmuACpJfpPtz10Q Fe/r+NYOp4XgeXVM18Ifi8p5lonx853OZrbuPzEsbBpSG4jp9mPmH4UbSOV8+xrS7s/4 tNatXl1T3vJKK3T4kf91u+kzsTh3T+3c/Q0CA6BvJLKmDmqhY/9ReT12BlyTMkdctBfO BGnQ== X-Gm-Message-State: AO0yUKWZYRcsCeN6TlFRMk3LvCS9TgzrRhaT/q3lb/ol42/F8aH5WfjX 6UNFafUA4woyZcPFOQIOd/qATZ54IIZGCkSasxOXKQ== X-Google-Smtp-Source: AK7set9KcFxcgBgOvFlB4117j0vmSRXNYNO65A30gArABQfkcUEfrN38aSMQU2A/k5B0ndvaCL9HCt0EhVPjdSUZ6Oc= X-Received: by 2002:adf:e351:0:b0:2bf:eba5:b652 with SMTP id n17-20020adfe351000000b002bfeba5b652mr196573wrj.19.1675388494864; Thu, 02 Feb 2023 17:41:34 -0800 (PST) MIME-Version: 1.0 References: <20230203014014.75720-1-irogers@google.com> In-Reply-To: <20230203014014.75720-1-irogers@google.com> From: Ian Rogers Date: Thu, 2 Feb 2023 17:41:22 -0800 Message-ID: Subject: Re: [PATCH v1] perf pmu: Fix aarch64 build To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , 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 Cc: Stephane Eranian , Perry Taylor , Caleb Biggers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 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. 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 >