From: "tip-bot2 for James Clark" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: James Clark <james.clark@arm.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Ian Rogers <irogers@google.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability
Date: Mon, 31 Jul 2023 10:19:30 -0000 [thread overview]
Message-ID: <169079877042.28540.9012324637381086320.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230724134500.970496-5-james.clark@arm.com>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 0cb52ad7bbb27bc6700412b055c743d5ae501b29
Gitweb: https://git.kernel.org/tip/0cb52ad7bbb27bc6700412b055c743d5ae501b29
Author: James Clark <james.clark@arm.com>
AuthorDate: Mon, 24 Jul 2023 14:44:59 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
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 <james.clark@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Ian Rogers <irogers@google.com>
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
struct perf_output_handle;
next prev parent reply other threads:[~2023-07-31 10:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-24 13:44 [PATCH v2 0/4] arm_pmu: Add PERF_PMU_CAP_EXTENDED_HW_TYPE capability James Clark
2023-07-24 13:44 ` [PATCH v2 1/4] " James Clark
2023-07-25 4:40 ` Anshuman Khandual
2023-07-31 10:19 ` [tip: perf/core] " tip-bot2 for James Clark
2023-07-24 13:44 ` [PATCH v2 2/4] perf/x86: Remove unused PERF_PMU_CAP_HETEROGENEOUS_CPUS capability James Clark
2023-07-31 10:19 ` [tip: perf/core] " tip-bot2 for James Clark
2023-07-24 13:44 ` [PATCH v2 3/4] arm_pmu: " James Clark
2023-07-25 4:41 ` Anshuman Khandual
2023-07-31 10:19 ` [tip: perf/core] " tip-bot2 for James Clark
2023-07-24 13:44 ` [PATCH v2 4/4] perf: " James Clark
2023-07-25 4:43 ` Anshuman Khandual
2023-07-31 10:19 ` tip-bot2 for James Clark [this message]
2023-07-25 12:10 ` [PATCH v2 0/4] arm_pmu: Add PERF_PMU_CAP_EXTENDED_HW_TYPE capability Peter Zijlstra
2023-07-28 14:02 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169079877042.28540.9012324637381086320.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=anshuman.khandual@arm.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®