From patchwork Fri Feb 3 01:40:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13126913 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 854F1C636D3 for ; Fri, 3 Feb 2023 01:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Mime-Version: Message-Id:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=wD3oAK7jyU0EO8KZm5GXTFIWNQVzDpSzrFjsx28JV3Y=; b=gSD CUC8yjqsS8IdY/1ufjuHnJOjDJ2AMfALUTy51/CsdVffL6vK9LVmMhH1zMFsvYMMHy1eZMB982/Am ULOYDwdKolnlDK+Lu8gP4GyQhv5VUBEqlo1VNwoqhNkRs6JzGA6Kpv0JvvAauUhKi3ieRqK+u3lwC ggRhwdnAHP+YVI4FpmcHMVZFhnrhzE1drd2eS8YV4as7deX0eKTZiE3V098NtZAvotD4N4I4qhiIV 4fIV/7q0G8PhhxvUwBRRhnLe4CWzweQQsvQhFUs1zv95PhJ58bd5Kuf1BLjptb2Cf7zznJ7sL8UBF ktrscYKgMHdZqa/DkSap/miZjhKLxTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNl49-00HZbq-Pj; Fri, 03 Feb 2023 01:40:37 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNl46-00HZaB-5n for linux-arm-kernel@lists.infradead.org; Fri, 03 Feb 2023 01:40:35 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id a4-20020a5b0004000000b006fdc6aaec4fso3490907ybp.20 for ; Thu, 02 Feb 2023 17:40:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=MyChsJPTVsY2fOwG/RI8qO+kUTadsY5ao3Rn6oLubwI=; b=q2Lfvwgba5mI01dB8lALvFJm9eJ5L6qh+bqk0DX7YFrZLVCPPEc4ohuNsRgVz/DWoa 45p4NxjS5Tc1u5rhYtkOxutMSFfev883SPN6LLMTF+pVdMycr5bePuiA4UIRHQz5bmMG zRiiSUVv2IaBHwMxrZbglAbdEKlQmmqfuwY5AFdTVPB9cpJ0EZxRn/4K85quJOTCZpi5 HE78n6XyxSyGucpzxCPCE77mwn66EGwiwRzQEtgwgENOIvH68rrdkfdOIYL+WWSM3dAE t4gePGaLe1+Ey+the2P/FX3skvPyNc0yYktf4Ltxq559JXe8PAfMYwDOsSj+u3GdckiS ay/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=MyChsJPTVsY2fOwG/RI8qO+kUTadsY5ao3Rn6oLubwI=; b=KtMKejPrCcjJ1sEtlk6L6XRTZVnQJp7NGXxKsk0HJ3nKSw23EjMePqV/SQeIxI24iX LcEIW7MCj1trwGIjTxR0G7BJHYWQgi+pPjJocxhSKKBDiPq2uyktUucZBTIuc2al/EAh a8OLkZ7FkUMpT/Xp+5l4ZAW+HrRegk2AA/jw8+yNvbsJINUJwH85Yj6RSBZdi2Jd1akf ZN7oZ6QAVRFktHP2Um6vgDBU36EGcZg4ygroeuKz1ZezPo+WvRq3BydIk09LLmRc8/sU HVsj4drn4p/28qCLxLh3H5+4zZ02mKsuMEICeflN5KBg2DZANsKw0NkNwTEmXXopx1n7 bt2A== X-Gm-Message-State: AO0yUKW9R7I0XTEUnXXp4V3kRJ5DrVklw5SpOf5ypXbd9Z4WBT8dDbYo Lst7OreqA7ce38wyeCcSwWWfJ5X5W2N/ X-Google-Smtp-Source: AK7set+0if6+qdzHg851jcAQ62KbEMrh7klQns415GjdzZzFFKMRMIpJ8w8d4/avuCsLvwLct18dnu+GKXDH X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3bb5:4c1f:1143:605]) (user=irogers job=sendgmr) by 2002:a25:d749:0:b0:833:79ab:566a with SMTP id o70-20020a25d749000000b0083379ab566amr906826ybg.27.1675388429315; Thu, 02 Feb 2023 17:40:29 -0800 (PST) Date: Thu, 2 Feb 2023 17:40:14 -0800 Message-Id: <20230203014014.75720-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Subject: [PATCH v1] perf pmu: Fix aarch64 build From: Ian Rogers 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 , Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230202_174034_252905_B03E7A02 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org ARM64 overrides a weak function but a previous change had broken the build. Fixes: 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") 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)