Received-SPF: pass (google.com: domain of linux-kernel+bounces-175223-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Jia He <justin.he@arm.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Kan Liang <kan.liang@linux.intel.com>,
	James Clark <james.clark@arm.com>,
	linux-perf-users@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Jia He <justin.he@arm.com>
Subject: [PATCH 1/2] perf pmu: Allow finishing loading json events when !events_table
Date: Fri, 10 May 2024 02:47:28 +0000
Message-Id: <20240510024729.1075732-2-justin.he@arm.com>
In-Reply-To: <20240510024729.1075732-1-justin.he@arm.com>
References: <20240510024729.1075732-1-justin.he@arm.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

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