Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

HardenedBSD · Sep 10, 2016 · 06bad73 · 06bad73
2 parents 416b904 + 2598fcc
commit 06bad73
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c
@@ -365,7 +365,7 @@ iaf_read_pmc(int cpu, int ri, pmc_value_t *v)
 	if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
 		*v = iaf_perfctr_value_to_reload_count(tmp);
 	else
-		*v = tmp;
+		*v = tmp & ((1ULL << core_iaf_width) - 1);
 
 	PMCDBG4(MDP,REA,1, "iaf-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri,
 	    IAF_RI_TO_MSR(ri), *v);