diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-17 11:54:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-17 11:54:00 +0200 |
| commit | 163435e5510875336ec4120883b71380533e001d (patch) | |
| tree | ea087eddb8cdf3aef685890d9c07366583b33916 /arch/x86/kvm/pmu.c | |
| parent | 11dd1b7778d07f6a9e8996e68e1fc6e175352ecb (diff) | |
| parent | fa74641fb6b93a19ccb50579886ecc98320230f9 (diff) | |
| download | linux-stable-linux-rolling-lts.tar.gz | |
Merge v6.1.29linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/pmu.c')
| -rw-r--r-- | arch/x86/kvm/pmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index de1fd7369736..20cd746cf467 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -418,9 +418,9 @@ int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data) if (!pmc) return 1; - if (!(kvm_read_cr4(vcpu) & X86_CR4_PCE) && + if (!(kvm_read_cr4_bits(vcpu, X86_CR4_PCE)) && (static_call(kvm_x86_get_cpl)(vcpu) != 0) && - (kvm_read_cr0(vcpu) & X86_CR0_PE)) + (kvm_read_cr0_bits(vcpu, X86_CR0_PE))) return 1; *data = pmc_read_counter(pmc) & mask; |