diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-20 11:02:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-20 11:02:05 +0200 |
| commit | ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53 (patch) | |
| tree | 95ce0819f92e25bc4d768ab13cee1f385a83a7b2 /arch/x86/events/intel/core.c | |
| parent | a30b85df7d599f626973e9cd3056fe755bd778e0 (diff) | |
| parent | 275d34b82561e695339b782950d49c386169dae3 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/core.c')
| -rw-r--r-- | arch/x86/events/intel/core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index cfd91a03304d..43445da30cea 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -4413,10 +4413,9 @@ static __init int fixup_ht_bug(void) return 0; } - if (lockup_detector_suspend() != 0) { - pr_debug("failed to disable PMU erratum BJ122, BV98, HSD29 workaround\n"); - return 0; - } + cpus_read_lock(); + + hardlockup_detector_perf_stop(); x86_pmu.flags &= ~(PMU_FL_EXCL_CNTRS | PMU_FL_EXCL_ENABLED); @@ -4424,9 +4423,7 @@ static __init int fixup_ht_bug(void) x86_pmu.commit_scheduling = NULL; x86_pmu.stop_scheduling = NULL; - lockup_detector_resume(); - - cpus_read_lock(); + hardlockup_detector_perf_restart(); for_each_online_cpu(c) free_excl_cntrs(c); |