[PATCH 1/2] perf pmu: Allow finishing loading json events when !events_table

Jia He posted 2 patches 1 year, 7 months ago
[PATCH 1/2] perf pmu: Allow finishing loading json events when !events_table
Posted by Jia He 1 year, 7 months ago
Otherwise, cpu_aliases_added is never set to true on an Arm v8a
Neoverse N2 server.

Signed-off-by: Jia He <justin.he@arm.com>
---
 tools/perf/util/pmu.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index f39cbbc1a7ec..a1eef7b2e389 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -915,13 +915,11 @@ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_tab
 
 static void pmu_add_cpu_aliases(struct perf_pmu *pmu)
 {
-	if (!pmu->events_table)
-		return;
-
 	if (pmu->cpu_aliases_added)
 		return;
 
-	pmu_add_cpu_aliases_table(pmu, pmu->events_table);
+	if (pmu->events_table)
+		pmu_add_cpu_aliases_table(pmu, pmu->events_table);
 	pmu->cpu_aliases_added = true;
 }
 
-- 
2.34.1