diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:19:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:19:31 +0100 |
| commit | ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b (patch) | |
| tree | 142b9e56d8cae8f2c5514582bd767470a2b4147e /arch/x86/kvm/svm/svm.c | |
| parent | e0efb3168d34dc8c8c72718672b8902e40efff8f (diff) | |
| parent | 0477e92881850d44910a7e94fc2c46f96faa131f (diff) | |
Merge 5.10-rc7 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/svm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm/svm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 1e81cfebd491..79b3a564f1c9 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1309,8 +1309,10 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu) svm->avic_is_running = true; svm->msrpm = svm_vcpu_alloc_msrpm(); - if (!svm->msrpm) + if (!svm->msrpm) { + err = -ENOMEM; goto error_free_vmcb_page; + } svm_vcpu_init_msrpm(vcpu, svm->msrpm); |