diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-09-24 06:04:42 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-09-24 06:04:42 -0400 |
| commit | 50b078184604fea95adbb144ff653912fb0e48c6 (patch) | |
| tree | 7398329706c87a4f144fc6d6734cbd500538d962 /arch/arm64/kvm/perf.c | |
| parent | 386ca9d7fd189b641bc5a82871e38dea9f67af85 (diff) | |
| parent | e840f42a49925707fca90e6c7a4095118fdb8c4d (diff) | |
Merge tag 'kvmarm-fixes-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/arm64 fixes for 5.15, take #1
- Add missing FORCE target when building the EL2 object
- Fix a PMU probe regression on some platforms
Diffstat (limited to 'arch/arm64/kvm/perf.c')
| -rw-r--r-- | arch/arm64/kvm/perf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kvm/perf.c b/arch/arm64/kvm/perf.c index f9bb3b14130e..c84fe24b2ea1 100644 --- a/arch/arm64/kvm/perf.c +++ b/arch/arm64/kvm/perf.c @@ -50,9 +50,6 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = { int kvm_perf_init(void) { - if (kvm_pmu_probe_pmuver() != ID_AA64DFR0_PMUVER_IMP_DEF && !is_protected_kvm_enabled()) - static_branch_enable(&kvm_arm_pmu_available); - return perf_register_guest_info_callbacks(&kvm_guest_cbs); } |