diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-30 17:11:20 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-30 17:11:20 +0200 |
| commit | f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82 (patch) | |
| tree | dc81d86b30c035f23e8fc4712bf16804af7ccc12 /include | |
| parent | KVM: nVMX: VMX instructions: fix segment checks when L1 is in long mode. (diff) | |
| parent | KVM: arm/arm64: Stop leaking vcpu pid references (diff) | |
| download | linux-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.tar.xz linux-f5c5c225fce4cb98fe4451d4c4d654e3f18b9f82.zip | |
Merge tag 'kvm-arm-for-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM Fixes for v4.7-rc6:
Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_pmu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index fe389ac31489..92e7e97ca8ff 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -18,13 +18,13 @@ #ifndef __ASM_ARM_KVM_PMU_H #define __ASM_ARM_KVM_PMU_H -#ifdef CONFIG_KVM_ARM_PMU - #include <linux/perf_event.h> #include <asm/perf_event.h> #define ARMV8_PMU_CYCLE_IDX (ARMV8_PMU_MAX_COUNTERS - 1) +#ifdef CONFIG_KVM_ARM_PMU + struct kvm_pmc { u8 idx; /* index into the pmu->pmc array */ struct perf_event *perf_event; |