svn commit: r308759 - stable/10/sys/dev/hwpmc

[Andriy Gapon]

Author: avg
Date: Thu Nov 17 15:14:59 2016
New Revision: 308759
URL: https://svnweb.freebsd.org/changeset/base/308759

Log:
  MFC r308101: hwpmc: fix a race between amd_stop_pmc and amd_intr

Modified:
  stable/10/sys/dev/hwpmc/hwpmc_amd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hwpmc/hwpmc_amd.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_amd.c	Thu Nov 17 15:14:54 2016	(r308758)
+++ stable/10/sys/dev/hwpmc/hwpmc_amd.c	Thu Nov 17 15:14:59 2016	(r308759)
@@ -690,12 +690,13 @@ amd_intr(int cpu, struct trapframe *tf)
 		error = pmc_process_interrupt(cpu, PMC_HR, pm, tf,
 		    TRAPF_USERMODE(tf));
 		if (error == 0)
-			wrmsr(evsel, config | AMD_PMC_ENABLE);
+			wrmsr(evsel, config);
 	}
 
 	atomic_add_int(retval ? &pmc_stats.pm_intr_processed :
 	    &pmc_stats.pm_intr_ignored, 1);
 
+	PMCDBG1(MDP,INT,2, "retval=%d", retval);
 	return (retval);
 }