From nobody Sun Feb 8 11:07:02 2026 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 6C8CBC001DC for ; Mon, 31 Jul 2023 10:19:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232324AbjGaKTi (ORCPT ); Mon, 31 Jul 2023 06:19:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbjGaKTd (ORCPT ); Mon, 31 Jul 2023 06:19:33 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61058B3; Mon, 31 Jul 2023 03:19:32 -0700 (PDT) Date: Mon, 31 Jul 2023 10:19:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690798771; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKeb39vgzdhyS40xyxQQrpUF2A3Pl/1GUNNbiF2XXIg=; b=OQOJ7F6yn2nsUpWTKO7Xvx/agcOW2rfUa29HtBq8nFEgILlYHlFviBxolEt8DOX2N2ryz1 jvAv5NQRQQm9jywsxim6fzdRfyDXM2TcgevWa8NZt54PZt3MCqa2O3ygGug67z8H46UzMi LZQ7JfLNv1BxV7wEtZBojAXbW1JyPeUUVnae+w5G2oj8+BTGta9xYB79lYYfbT3f3W3VV2 zCqH+ye+9FdH5OfcIOWMMcdd4qGhAFqcjLsinXkxCU3jO+mzpeKQpnqImDFBNS4KtUZB0S NApWt+mtJbWh4qaftMjc3be54fWLCizWGfauc+h7eLPRuAGA7vQ70HjN0HJDaA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690798771; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EKeb39vgzdhyS40xyxQQrpUF2A3Pl/1GUNNbiF2XXIg=; b=E0/1bPetgg8MQye830EUhwK0PGg9K/H/JzTqd0Cg8X+0UPnYa8xMIwS+H+5OBUAVaBa/93 EkMYSiEHo46z2yDQ== From: "tip-bot2 for James Clark" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability Cc: James Clark , "Peter Zijlstra (Intel)" , Anshuman Khandual , Ian Rogers , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230724134500.970496-5-james.clark@arm.com> References: <20230724134500.970496-5-james.clark@arm.com> MIME-Version: 1.0 Message-ID: <169079877042.28540.9012324637381086320.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 0cb52ad7bbb27bc6700412b055c743d5ae501b29 Gitweb: https://git.kernel.org/tip/0cb52ad7bbb27bc6700412b055c743d5a= e501b29 Author: James Clark AuthorDate: Mon, 24 Jul 2023 14:44:59 +01:00 Committer: Peter Zijlstra CommitterDate: Wed, 26 Jul 2023 12:28:47 +02:00 perf: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability Since commit bd2756811766 ("perf: Rewrite core context handling") the relationship between perf_event_context and PMUs has changed so that the error scenario that PERF_PMU_CAP_HETEROGENEOUS_CPUS originally silenced no longer exists. Remove the capability to avoid confusion that it actually influences any perf core behavior and shift down the following capability bits to fill in the unused space. This change should be a no-op. Signed-off-by: James Clark Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Anshuman Khandual Acked-by: Ian Rogers Link: https://lore.kernel.org/r/20230724134500.970496-5-james.clark@arm.com --- include/linux/perf_event.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index dd92b4f..9b1cf3c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -288,10 +288,9 @@ struct perf_event_pmu_context; #define PERF_PMU_CAP_EXTENDED_REGS 0x0008 #define PERF_PMU_CAP_EXCLUSIVE 0x0010 #define PERF_PMU_CAP_ITRACE 0x0020 -#define PERF_PMU_CAP_HETEROGENEOUS_CPUS 0x0040 -#define PERF_PMU_CAP_NO_EXCLUDE 0x0080 -#define PERF_PMU_CAP_AUX_OUTPUT 0x0100 -#define PERF_PMU_CAP_EXTENDED_HW_TYPE 0x0200 +#define PERF_PMU_CAP_NO_EXCLUDE 0x0040 +#define PERF_PMU_CAP_AUX_OUTPUT 0x0080 +#define PERF_PMU_CAP_EXTENDED_HW_TYPE 0x0100 =20 struct perf_output_handle;