diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /arch/x86/kvm/svm.c | |
parent | ALSA: hda - fix an external mic jack problem on a HP machine (diff) | |
parent | ALSA: hda - add mic mute led hook for dell machines (diff) | |
download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ec8366c5cfea..b5e994ad0135 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1462,6 +1462,7 @@ static void svm_get_segment(struct kvm_vcpu *vcpu, */ if (var->unusable) var->db = 0; + var->dpl = to_svm(vcpu)->vmcb->save.cpl; break; } } |