D45526.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45526.diff
View Options

	diff --git a/sys/dev/hwpmc/hwpmc_arm64.h b/sys/dev/hwpmc/hwpmc_arm64.h
	--- a/sys/dev/hwpmc/hwpmc_arm64.h
	+++ b/sys/dev/hwpmc/hwpmc_arm64.h
	@@ -42,7 +42,7 @@
	#ifdef _KERNEL
	/* MD extension for 'struct pmc' */
	struct pmc_md_arm64_pmc {
	- uint32_t pm_arm64_evsel;
	+ uint64_t pm_arm64_evsel;
	};
	#endif /* _KERNEL */
	#endif /* _DEV_HWPMC_ARMV8_H_ */
	diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c
	--- a/sys/dev/hwpmc/hwpmc_arm64.c
	+++ b/sys/dev/hwpmc/hwpmc_arm64.c
	@@ -163,7 +163,7 @@
	arm64_allocate_pmc(int cpu, int ri, struct pmc *pm,
	const struct pmc_op_pmcallocate *a)
	{
	- uint32_t config;
	+ uint64_t config;
	enum pmc_event pe;

	KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
	@@ -201,7 +201,8 @@
	}

	pm->pm_md.pm_arm64.pm_arm64_evsel = config;
	- PMCDBG2(MDP, ALL, 2, "arm64-allocate ri=%d -> config=0x%x", ri, config);
	+ PMCDBG2(MDP, ALL, 2, "arm64-allocate ri=%d -> config=0x%lx", ri,
	+ config);

	return (0);
	}
	@@ -299,7 +300,7 @@
	static int
	arm64_start_pmc(int cpu, int ri, struct pmc *pm)
	{
	- uint32_t config;
	+ uint64_t config;

	config = pm->pm_md.pm_arm64.pm_arm64_evsel;