diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-04 18:39:29 -0500 |
| commit | 0564eeb71bbb0e1a566fb701f90155bef9e7a224 (patch) | |
| tree | 2935323651d0f8ab2acb5f96f6ee6c722a9cad5a /arch/arm64/kvm/psci.c | |
| parent | b652de1e3dfb3b49e539e88a684a68e333e1bd7c (diff) | |
| parent | 8d25b7beca7ed6ca34f53f0f8abd009e2be15d94 (diff) | |
| download | linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.gz linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.tar.bz2 linux-stable-0564eeb71bbb0e1a566fb701f90155bef9e7a224.zip | |
Merge branch 'kvm-bugfixes' into HEAD
Merge bugfixes from 5.17 before merging more tricky work.
Diffstat (limited to 'arch/arm64/kvm/psci.c')
| -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; } |