diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-25 09:49:30 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-25 09:49:30 -0500 |
| commit | ece32a75f003464cad59c26305b4462305273d70 (patch) | |
| tree | eeeec1b34efe28edf6b1860fc74d3b3e95f7a785 /arch | |
| parent | 1a71581012ddf1f465040ef3d9f700341fa3cf04 (diff) | |
| parent | 456f89e0928ab938122a40e9f094a6524cc158b4 (diff) | |
Merge tag 'kvmarm-fixes-5.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.17, take #4
- Correctly synchronise PMR and co on PSCI CPU_SUSPEND
- Skip tests that depend on GICv3 when the HW isn't available
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/psci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c index 3eae32876897..2ce60fecd861 100644 --- a/arch/arm64/kvm/psci.c +++ b/arch/arm64/kvm/psci.c @@ -46,8 +46,7 @@ static unsigned long kvm_psci_vcpu_suspend(struct kvm_vcpu *vcpu) * specification (ARM DEN 0022A). This means all suspend states * for KVM will preserve the register state. */ - kvm_vcpu_halt(vcpu); - kvm_clear_request(KVM_REQ_UNHALT, vcpu); + kvm_vcpu_wfi(vcpu); return PSCI_RET_SUCCESS; } |