D59881.id.diff
No OneTemporary
Actions

Size

770 B

Referenced Files

None

Subscribers

None

D59881.id.diff
View Options

	diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c
	--- a/sys/dev/hwpmc/hwpmc_amd.c
	+++ b/sys/dev/hwpmc/hwpmc_amd.c
	@@ -1270,6 +1270,8 @@

	pmc_perf_finalize(md);

	+ pmc_ibs_finalize(md);
	+
	for (int i = 0; i < pmc_cpu_max(); i++)
	KASSERT(amd_pcpu[i] == NULL,
	("[amd,%d] non-null pcpu cpu %d", __LINE__, i));
	diff --git a/sys/dev/hwpmc/hwpmc_ibs.c b/sys/dev/hwpmc/hwpmc_ibs.c
	--- a/sys/dev/hwpmc/hwpmc_ibs.c
	+++ b/sys/dev/hwpmc/hwpmc_ibs.c
	@@ -918,6 +918,10 @@
	{
	PMCDBG0(MDP, INI, 1, "ibs-finalize");

	+ /* Safe even if the IBS class was skipped at initialize time. */
	+ if (ibs_pcpu == NULL)
	+ return;
	+
	for (int i = 0; i < pmc_cpu_max(); i++)
	KASSERT(ibs_pcpu[i] == NULL,
	("[ibs,%d] non-null pcpu cpu %d", __LINE__, i));