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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/perf/arm_pmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 3cbc3baf087f..295cc7952d0e 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -952,6 +952,8 @@ int armpmu_register(struct arm_pmu *pmu) pmu->name, pmu->num_events, has_nmi ? ", using NMIs" : ""); + kvm_host_pmu_init(pmu); + return 0; out_destroy: |