Merge pull request #2676 from elfiesmelfie/fix_intel_pmu_crash