diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 12:28:15 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 12:28:15 -0500 |
commit | d72cf8ffe460824fdc97f0a9295a2c4e0231a562 (patch) | |
tree | 1cf0d952f5066191eb9700aae882905e8546264c /arch/x86/xen/pmu.c | |
parent | KVM: x86/pmu: Limit the maximum number of supported AMD GP counters (diff) | |
parent | KVM: s390: pci: Fix allocation size of aift kzdev elements (diff) | |
download | linux-dev-d72cf8ffe460824fdc97f0a9295a2c4e0231a562.tar.xz linux-dev-d72cf8ffe460824fdc97f0a9295a2c4e0231a562.zip |
Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A PCI allocation fix and a PV clock fix.
Diffstat (limited to 'arch/x86/xen/pmu.c')
-rw-r--r-- | arch/x86/xen/pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c index 68aff1382872..246d67dab510 100644 --- a/arch/x86/xen/pmu.c +++ b/arch/x86/xen/pmu.c @@ -302,7 +302,7 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) static bool pmu_msr_chk_emulated(unsigned int msr, uint64_t *val, bool is_read, bool *emul) { - int type, index; + int type, index = 0; if (is_amd_pmu_msr(msr)) *emul = xen_amd_pmu_emulate(msr, val, is_read); |