Date: Thu, 17 Nov 2016 15:14:54 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r308758 - stable/11/sys/dev/hwpmc Message-ID: <201611171514.uAHFEskb072503@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Nov 17 15:14:54 2016 New Revision: 308758 URL: https://svnweb.freebsd.org/changeset/base/308758 Log: MFC r308101: hwpmc: fix a race between amd_stop_pmc and amd_intr Modified: stable/11/sys/dev/hwpmc/hwpmc_amd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/hwpmc/hwpmc_amd.c ============================================================================== --- stable/11/sys/dev/hwpmc/hwpmc_amd.c Thu Nov 17 15:13:20 2016 (r308757) +++ stable/11/sys/dev/hwpmc/hwpmc_amd.c Thu Nov 17 15:14:54 2016 (r308758) @@ -689,12 +689,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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611171514.uAHFEskb072503>