diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-08 05:02:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-08 05:02:40 -0500 |
| commit | 774206bc03bf5daa17255b2f155d4a967e3f3314 (patch) | |
| tree | 6d0dfb3650546fd0360029d9a76009ea8875f280 /include | |
| parent | 647daca25d24fb6eadc7b6cd680ad3e6eed0f3d5 (diff) | |
| parent | 45ba7b195a369f35cb39094fdb32efe5908b34ad (diff) | |
| download | linux-774206bc03bf5daa17255b2f155d4a967e3f3314.tar.bz2 | |
Merge tag 'kvmarm-fixes-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.11, take #1
- VM init cleanups
- PSCI relay cleanups
- Kill CONFIG_KVM_ARM_PMU
- Fixup __init annotations
- Fixup reg_to_encoding()
- Fix spurious PMCR_EL0 access
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index fc85f50fa0e9..8dcb3e1477bc 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -13,7 +13,7 @@ #define ARMV8_PMU_CYCLE_IDX (ARMV8_PMU_MAX_COUNTERS - 1) #define ARMV8_PMU_MAX_COUNTER_PAIRS ((ARMV8_PMU_MAX_COUNTERS + 1) >> 1) -#ifdef CONFIG_KVM_ARM_PMU +#ifdef CONFIG_HW_PERF_EVENTS struct kvm_pmc { u8 idx; /* index into the pmu->pmc array */ |