diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-30 16:51:07 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-30 16:51:07 +0200 |
commit | dc720f95939280f9e69cafe7389be6d0fa6f22dd (patch) | |
tree | e93d713cebd69147e59a5a1df23527f1abc3ca6a | |
parent | 27e6fb5dae2819d17f38dc9224692b771e989981 (diff) | |
parent | 33b458d276bbdbe28febac0742835002b9f4778d (diff) |
Merge commit '33b458d276bb' into kvm-next
Fix bad x86 regression introduced during merge window.
-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; } } |