diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-21 23:03:39 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-21 23:03:39 +0300 |
| commit | 6e0e846ee2ab01bc44254e6a0a6a6a0db1cba16d (patch) | |
| tree | e2a39b9ff9fbfa9adbaa004e3b42047664a8e57d /arch/riscv/kvm/vcpu.c | |
| parent | 5588d628027092e66195097bdf6835ddf64418b3 (diff) | |
| parent | 7ca433dc6dedb2ec98dfc943f6db0c9b8996ed11 (diff) | |
| download | linux-6e0e846ee2ab01bc44254e6a0a6a6a0db1cba16d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/riscv/kvm/vcpu.c')
| -rw-r--r-- | arch/riscv/kvm/vcpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 7f4ad5e4373a..f3455dc013fa 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -781,9 +781,11 @@ static void kvm_riscv_check_vcpu_requests(struct kvm_vcpu *vcpu) if (kvm_request_pending(vcpu)) { if (kvm_check_request(KVM_REQ_SLEEP, vcpu)) { + kvm_vcpu_srcu_read_unlock(vcpu); rcuwait_wait_event(wait, (!vcpu->arch.power_off) && (!vcpu->arch.pause), TASK_INTERRUPTIBLE); + kvm_vcpu_srcu_read_lock(vcpu); if (vcpu->arch.power_off || vcpu->arch.pause) { /* |