diff options
author | 2022-09-29 13:25:13 -0400 | |
---|---|---|
committer | 2022-09-30 07:09:48 -0400 | |
commit | c99ad25b0d2bdb703a23217cfb0cf4bab364e9c7 (patch) | |
tree | 689021e8b0b99c46f195ad78bdeec72d67b5ff26 /arch/powerpc/kvm/book3s_pr.c | |
parent | KVM: selftests: Fix nx_huge_pages_test on TDP-disabled hosts (diff) | |
parent | KVM: x86/svm/pmu: Rewrite get_gp_pmc_amd() for more counters scalability (diff) | |
download | linux-dev-c99ad25b0d2bdb703a23217cfb0cf4bab364e9c7.tar.xz linux-dev-c99ad25b0d2bdb703a23217cfb0cf4bab364e9c7.zip |
Merge tag 'kvm-x86-6.1-2' of https://github.com/sean-jc/linux into HEAD
KVM x86 updates for 6.1, batch #2:
- Misc PMU fixes and cleanups.
- Fixes for Hyper-V hypercall selftest
Diffstat (limited to 'arch/powerpc/kvm/book3s_pr.c')
-rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index d6abed6e51e6..9fc4dd8f66eb 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -499,7 +499,6 @@ static void kvmppc_set_msr_pr(struct kvm_vcpu *vcpu, u64 msr) if (msr & MSR_POW) { if (!vcpu->arch.pending_exceptions) { kvm_vcpu_halt(vcpu); - kvm_clear_request(KVM_REQ_UNHALT, vcpu); vcpu->stat.generic.halt_wakeup++; /* Unset POW bit after we woke up */ |