This is a note to let you know that I've just added the patch titled
perf test: Fix "PMU event table sanity" for NO_JEVENTS=1
to the 6.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-test-fix-pmu-event-table-sanity-for-no_jevents-.patch
and it can be found in the queue-6.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 00b9347f95bce496b159f5a97a1722a274398828
Author: Ian Rogers <irogers@xxxxxxxxxx>
Date: Tue Mar 7 16:27:14 2023 -0800
perf test: Fix "PMU event table sanity" for NO_JEVENTS=1
[ Upstream commit 07fc5921a014e227bd3b622d31a8a35ff3f19afb ]
A table was renamed and needed to be renamed in the empty case.
Fixes: 62774db2a05dc878 ("perf jevents: Generate metrics and events as separate tables")
Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: Ian Rogers <irogers@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Kajol Jain <kjain@xxxxxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230308002714.1755698-1-irogers@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c
index a938b74cf487c..e74defb5284ff 100644
--- a/tools/perf/pmu-events/empty-pmu-events.c
+++ b/tools/perf/pmu-events/empty-pmu-events.c
@@ -227,7 +227,7 @@ static const struct pmu_events_map pmu_events_map[] = {
},
};
-static const struct pmu_event pme_test_soc_sys[] = {
+static const struct pmu_event pmu_events__test_soc_sys[] = {
{
.name = "sys_ddr_pmu.write_cycles",
.event = "event=0x2b",
@@ -258,8 +258,8 @@ struct pmu_sys_events {
static const struct pmu_sys_events pmu_sys_event_tables[] = {
{
- .table = { pme_test_soc_sys },
- .name = "pme_test_soc_sys",
+ .table = { pmu_events__test_soc_sys },
+ .name = "pmu_events__test_soc_sys",
},
{
.table = { 0 }
