Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / arch / x86 / kvm / svm / sev.c

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 3225533..6a22798 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1566,7 +1566,7 @@ static int sev_lock_two_vms(struct kvm *dst_kvm, struct kvm *src_kvm)
        r = -EINTR;
        if (mutex_lock_killable(&dst_kvm->lock))
                goto release_src;
-       if (mutex_lock_killable(&src_kvm->lock))
+       if (mutex_lock_killable_nested(&src_kvm->lock, SINGLE_DEPTH_NESTING))
                goto unlock_dst;
        return 0;