diff options
author | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:34:30 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:34:31 -0400 |
commit | 9eb8902e278f3314e1e9429c5f13db9e7a7a0cff (patch) | |
tree | 4c37354471b909f07c02726eba22caa56a910108 /arch/x86/kvm/svm.c | |
parent | Merge airlied/drm-next into drm-misc-next (diff) | |
parent | documentation: media: Add documentation for new RGB and YUV bus formats (diff) | |
download | linux-dev-9eb8902e278f3314e1e9429c5f13db9e7a7a0cff.tar.xz linux-dev-9eb8902e278f3314e1e9429c5f13db9e7a7a0cff.zip |
Merge tag 'topic/synopsys-media-formats-2017-04-03' of git://anongit.freedesktop.org/git/drm-misc into drm-misc-next
Media formats for synopsys HDMI TX Controller
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index d1efe2c62b3f..5fba70646c32 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1379,6 +1379,9 @@ static void avic_vm_destroy(struct kvm *kvm) unsigned long flags; struct kvm_arch *vm_data = &kvm->arch; + if (!avic) + return; + avic_free_vm_id(vm_data->avic_vm_id); if (vm_data->avic_logical_id_table_page) |